diff --git a/.gitea/workflows/build-dev.yml b/.gitea/workflows/build-dev.yml
index 959261c..bdd6d25 100644
--- a/.gitea/workflows/build-dev.yml
+++ b/.gitea/workflows/build-dev.yml
@@ -45,33 +45,34 @@ jobs:
           . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
           nix flake update radiantwave-dev
 
-        # This builds the system closure
-      - name: Build dev VM
-        run: |
-          export NIXPKGS_ALLOW_UNFREE=1
-          . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-          nix build -L --impure .#nixosConfigurations.radiantwavekiosk-dev.config.system.build.toplevel
-
-        # If the closure builds, it's valid, even if incorrect and something is wrong.
-        # That's why we build the ISO next, even for the dev branch, for testing
       - name: Build dev ISO
         run: |
           export NIXPKGS_ALLOW_UNFREE=1
           . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
-          nix build -L --impure .#nixosConfigurations.dev-iso.config.system.build.isoImage
-          cp -rL result/iso/*.iso /home/runner/radiantwave/radiantwave-kiosk-iso-dev-$(date +%Y-%m-%d_%H-%M-%S).iso
 
-      - name: Commit updated flake.lock
-        run: |
-          git config user.email "ci@radiantwavetech.com"
-          git config user.name "RadiantWave CI"
-          git remote set-url origin https://oauth2:${{ secrets.GIT_TOKEN }}@gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git
-          git add flake.lock
-          git commit -m "chore: update radiantwave-dev to latest dev" || echo "Nothing to commit"
-          git push
+          nix build -L --impure .#nixosConfigurations.dev-iso.config.system.build.isoImage
+
+          ISO_NAME="radiantwave-kiosk-iso-dev-$(date +%Y-%m-%d_%H-%M-%S).iso"
+          ISO_PATH="/home/runner/radiantwave/${ISO_NAME}"
+
+          cp -L result/iso/*.iso "${ISO_PATH}"
+
+          echo "ISO_NAME=${ISO_NAME}" >> "$GITHUB_ENV"
+          echo "ISO_PATH=${ISO_PATH}" >> "$GITHUB_ENV"
 
       - name: Copy ISO to fileserver
-        run: scp /home/runner/radiantwave/iso/* radiantwave-infra:/mnt/infrastructure_data/files/images/
+        run: |
+          scp "${ISO_PATH}" \
+            radiantwave-infra:/mnt/infrastructure_data/files/images/"${ISO_NAME}"
+
+            - name: Commit updated flake.lock
+              run: |
+                git config user.email "ci@radiantwavetech.com"
+                git config user.name "RadiantWave CI"
+                git remote set-url origin https://oauth2:${{ secrets.GIT_TOKEN }}@gitea.radiantwavetech.com/RadiantWaveTech/KioskConfig.git
+                git add flake.lock
+                git commit -m "chore: update radiantwave-dev to latest dev" || echo "Nothing to commit"
+                git push
 
       - name: Notify
         if: always()