diff --git a/.github/workflows/build-aurora-iso.yml b/.github/workflows/build-aurora-iso.yml
deleted file mode 100644
index 68ead74abc2..00000000000
--- a/.github/workflows/build-aurora-iso.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: bluefin ISOs
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: build
-    uses: ./.github/workflows/reusable-build-iso.yml
-    secrets: inherit
-    with:
-      brand_name: aurora
\ No newline at end of file
diff --git a/.github/workflows/build-bluefin-iso.yml b/.github/workflows/build-bluefin-iso.yml
deleted file mode 100644
index 8568a8fad69..00000000000
--- a/.github/workflows/build-bluefin-iso.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: bluefin ISOs
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: build
-    uses: ./.github/workflows/reusable-build-iso.yml
-    secrets: inherit
-    with:
-      brand_name: bluefin
\ No newline at end of file
diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml
index 46da020eeaf..28be74d2f6d 100644
--- a/.github/workflows/reusable-build-iso.yml
+++ b/.github/workflows/reusable-build-iso.yml
@@ -169,6 +169,16 @@ jobs:
           compression-level: 0
           overwrite: true
 
+      - name: Move ISOs to Upload Directory
+        id: upload-directory
+        shell: bash
+        run: |
+          ISO_UPLOAD_DIR=${{ github.workspace }}/upload
+          mkdir ${ISO_UPLOAD_DIR}
+          mv ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }} ${ISO_UPLOAD_DIR}
+          mv ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }}-CHECKSUM ${ISO_UPLOAD_DIR}
+          echo "iso-upload-dir=${ISO_UPLOAD_DIR}" >> $GITHUB_OUTPUT
+
       - name: Upload ISOs and Checksum to R2
         if: github.event_name == 'workflow_dispatch' && github.ref_name == 'main'
         shell: bash