diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml
index 026d40a..875c480 100644
--- a/.forgejo/workflows/build-image.yml
+++ b/.forgejo/workflows/build-image.yml
@@ -32,6 +32,9 @@ jobs:
           nix-env -iA nixpkgs.ansible
           nix-env -iA nixpkgs.jq
           nix-env -iA nixpkgs.openssh
+          nix-env -iA cachix -f https://cachix.org/api/v1/install
+          cachix use plasmagoat
+          cachix authtoken ${{ secrets.CACHIX_AUTH_TOKEN }}
 
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -62,14 +65,8 @@ jobs:
           echo "Testing SSH connection to $PROXMOX_HOST..."
           ssh -o StrictHostKeyChecking=yes "$PROXMOX_USER"@"$PROXMOX_HOST" "echo 'SSH success. Hostname:' && hostname"
 
-      - name: Setup Cachix
-        run: |
-          nix-env -iA cachix -f https://cachix.org/api/v1/install
-          cachix use plasmagoat
-          cachix authtoken ${{ secrets.CACHIX_AUTH_TOKEN }}
-
-      - name: Build NixOS image (creates result/ symlink)
-        id: build_image # Changed ID for clarity
+      - name: Build NixOS image
+        id: build_image
         run: |
           nix build .#base \
           --builders "ssh://$NIXOS_BUILER_USER@$NIXOS_BUILER_HOST x86_64-linux ~/.ssh/id_rsa 1 1 kvm" \
@@ -85,15 +82,6 @@ jobs:
           fi
           echo "image_path_from_build=${IMAGE_PATH}" >> "$GITHUB_OUTPUT"
 
-      - name: Set VERSION from tag or fallback
-        id: version # Keep original ID
-        run: |
-          if [ -n "${CI_COMMIT_TAG}" ]; then # Use CI_COMMIT_TAG for Forgejo
-            echo "tag=${CI_COMMIT_TAG}" >> "$GITHUB_OUTPUT"
-          else
-            echo "tag=dev-$(date +%s)" >> "$GITHUB_OUTPUT"
-          fi
-
       - name: Run Proxmox Image Deployment
         run: |
           chmod +x ./scripts/run_ansible_ci.sh
@@ -122,11 +110,14 @@ jobs:
     if: success()
 
     steps:
-      # - name: Download Artifact
-      #   id: artifact
-      #   uses: actions/download-artifact@v3
-      #   with:
-      #     name: nixos-base-image
+      - name: Set VERSION from tag or fallback
+        id: version
+        run: |
+          if [ -n "${CI_COMMIT_TAG}" ]; then # Use CI_COMMIT_TAG for Forgejo
+            echo "tag=${CI_COMMIT_TAG}" >> "$GITHUB_OUTPUT"
+          else
+            echo "tag=dev-$(date +%s)" >> "$GITHUB_OUTPUT"
+          fi
 
       - name: Create Forgejo Release
         uses: https://code.forgejo.org/sheik/forgejo-release@v2.6.0