diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
index a05f971..ab00d7c 100644
--- a/.forgejo/workflows/build.yml
+++ b/.forgejo/workflows/build.yml
@@ -31,6 +31,21 @@ jobs:
           mkdir -p ~/.config/containers
           echo '{ "default": [ {"type":"insecureAcceptAnything"} ] }' > ~/.config/containers/policy.json
 
+      - name: Create image
+        run: |
+          nix-build src/default.nix | podman load
+
+      - uses: https://github.com/Frozen-Tapestry/container-action@v1
+        with:
+          login_registry: ${{ env.registry }}
+          login_username: ${{ env.actor }}
+          login_password: ${{ env.token }}
+
+          tags: ${{ env.registry }}/${{ env.owner }}/${{ env.image }}:${{ env.tag }}
+          # tags: localhost/${{ env.image }}:${{ env.tag }}
+
+          push: true
+
       - name: Log into registry
         run: >-
           podman login
@@ -40,11 +55,6 @@ jobs:
           --password "${{ forge.token }}"
           ${{ env.registry }}
 
-      - name: Create image
-        run: |
-          nix-build src/default.nix
-          podman load < result
-
       - name: __DEBUG__
         run: |
           echo "~/.config/containers/auth.json"
diff --git a/src/default.nix b/src/default.nix
index 608cc69..e5f56f9 100644
--- a/src/default.nix
+++ b/src/default.nix
@@ -5,7 +5,7 @@
 
 with pkgs;
 dockerTools.buildImage {
-  name = "default";
+  name = "git.amarth.cloud/default";
   tag = "latest";
 
   copyToRoot = buildEnv {