diff --git a/.gitea/workflows/build-dev.yml b/.gitea/workflows/build-dev.yml
index dd685ba..f22773e 100644
--- a/.gitea/workflows/build-dev.yml
+++ b/.gitea/workflows/build-dev.yml
@@ -1,4 +1,4 @@
-name: Build Dev ISO
+name: Build Dev ISOs
 
 on:
   workflow_dispatch:
@@ -12,9 +12,8 @@ env:
     extra-trusted-public-keys = radiantwave-dev:B8FhLu3MQ9JfeEIHIKNrKxnP+3akzzkqMbTZR4hRfj0=
 
 jobs:
-  build-dev-iso:
+  build-dev-kiosk:
     runs-on: build-server
-
     steps:
       - name: Clone Repository
         run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
@@ -25,27 +24,98 @@ jobs:
       - name: Prepare output directory
         run: mkdir -p /home/user/radiantwave
 
-      # --- Kiosk ISO ---
-      - name: Build kiosk ISO
+      - name: Build dev kiosk 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
 
-      - name: Rename kiosk ISO
+      - name: Rename dev kiosk ISO
         run: |
           ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S)
-          FILENAME="radiantwave-kiosk-dev-iso-${ISO_DATE}.iso"
+          FILENAME="radiantwave-kiosk-dev-${ISO_DATE}.iso"
           cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}"
-          echo "KIOSK_ISO_FILENAME=${FILENAME}" >> "$GITHUB_ENV"
+          echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV"
 
-      - name: Move old dev images to archive
+      - name: Move old dev kiosk images to archive
         run: tools/archive-images.sh nclack@157.245.124.103 /mnt/infrastructure_data/files/images /mnt/infrastructure_data/files/images/archives 'radiantwave-kiosk-dev*'
 
-      - name: Copy kiosk ISO to fileserver
+      - name: Copy dev kiosk ISO to fileserver
         run: |
-          scp "/home/user/radiantwave/${KIOSK_ISO_FILENAME}" \
+          scp "/home/user/radiantwave/${FILENAME}" \
             radiantwave-infra:/mnt/infrastructure_data/files/images/
 
-      - name: Cleanup kiosk ISO
-        run: rm -f "/home/user/radiantwave/${KIOSK_ISO_FILENAME}"
+      - name: Cleanup
+        run: rm -f "/home/user/radiantwave/${FILENAME}"
+
+  build-dev-commercial:
+    runs-on: build-server
+    steps:
+      - name: Clone Repository
+        run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
+
+      - name: Checkout dev branch
+        run: git checkout dev
+
+      - name: Prepare output directory
+        run: mkdir -p /home/user/radiantwave
+
+      - name: Build dev commercial ISO
+        run: |
+          export NIXPKGS_ALLOW_UNFREE=1
+          . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
+          nix build -L --impure .#nixosConfigurations.commercial-dev-iso.config.system.build.isoImage
+
+      - name: Rename dev commercial ISO
+        run: |
+          ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S)
+          FILENAME="radiantwave-commercial-dev-${ISO_DATE}.iso"
+          cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}"
+          echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV"
+
+      - name: Move old dev commercial images to archive
+        run: tools/archive-images.sh nclack@157.245.124.103 /mnt/infrastructure_data/files/images /mnt/infrastructure_data/files/images/archives 'radiantwave-commercial-dev*'
+
+      - name: Copy dev commercial ISO to fileserver
+        run: |
+          scp "/home/user/radiantwave/${FILENAME}" \
+            radiantwave-infra:/mnt/infrastructure_data/files/images/
+
+      - name: Cleanup
+        run: rm -f "/home/user/radiantwave/${FILENAME}"
+
+  build-dev-android:
+    runs-on: build-server
+    steps:
+      - name: Clone Repository
+        run: git clone --depth 1 --no-single-branch ssh://git@gitea.radiantwavetech.com:2222/RadiantWaveTech/KioskConfig.git .
+
+      - name: Checkout dev branch
+        run: git checkout dev
+
+      - name: Prepare output directory
+        run: mkdir -p /home/user/radiantwave
+
+      - name: Build dev android ISO
+        run: |
+          export NIXPKGS_ALLOW_UNFREE=1
+          . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
+          nix build -L --impure .#nixosConfigurations.android-dev-iso.config.system.build.isoImage
+
+      - name: Rename dev android ISO
+        run: |
+          ISO_DATE=$(date +%Y-%m-%d_%H-%M-%S)
+          FILENAME="radiantwave-android-dev-${ISO_DATE}.iso"
+          cp -L result/iso/*.iso "/home/user/radiantwave/${FILENAME}"
+          echo "FILENAME=${FILENAME}" >> "$GITHUB_ENV"
+
+      - name: Move old dev android images to archive
+        run: tools/archive-images.sh nclack@157.245.124.103 /mnt/infrastructure_data/files/images /mnt/infrastructure_data/files/images/archives 'radiantwave-android-dev*'
+
+      - name: Copy dev android ISO to fileserver
+        run: |
+          scp "/home/user/radiantwave/${FILENAME}" \
+            radiantwave-infra:/mnt/infrastructure_data/files/images/
+
+      - name: Cleanup
+        run: rm -f "/home/user/radiantwave/${FILENAME}"