diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1140bcfb..1c8ce5e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         hw_version: [hw1, hw2]
         br_config:
-          [3do, cdi, dreamcast, gamecube, gbahd, genesis, jaguar, jvs_arcade, n64, nes,
+          [common, 3do, cdi, dreamcast, gamecube, gbahd, genesis, jaguar, jvs_arcade, n64, nes,
           parallel_1p, parallel_1p_3v3, parallel_2p, parallel_2p_3v3, pc_engine, pcfx,
           playstation, saturn, snes, universal, virtualboy, wii_extension]
         include:
@@ -48,13 +48,25 @@ jobs:
       run: |
         mkdir ota
         mv ota_data_initial.bin ota/
+    - name: Delete common files
+      working-directory: ./build
+      if: ${{ matrix.br_config != 'common' }}
+      run: |
+        rm -fr bootloader
+        rm -fr partition_table
+        rm -fr ota
+    - name: Delete firmware files
+      working-directory: ./build
+      if: ${{ matrix.br_config == 'common' }}
+      run: |
+        rm -f BlueRetro*
     - name: Upload artifact
-      uses: darthcloud/upload-artifact@v4
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.br_version }}_${{ matrix.hw_version }}
         path: |
           build/partition_table/partition-table.bin
           build/bootloader/bootloader.bin
           build/ota/ota_data_initial.bin
-          build/BlueRetro*.bin
-        if-no-files-found: error
+          build/BlueRetro_${{ matrix.hw_version }}_${{ matrix.br_config }}.bin
+        if-no-files-found: ignore
diff --git a/configs/hw1/common b/configs/hw1/common
new file mode 100644
index 00000000..3f5628e3
--- /dev/null
+++ b/configs/hw1/common
@@ -0,0 +1,2 @@
+CONFIG_BLUERETRO_HW2=n
+CONFIG_BLUERETRO_SYSTEM_PARALLEL_1P=y
\ No newline at end of file
diff --git a/configs/hw2/common b/configs/hw2/common
new file mode 100644
index 00000000..f5176849
--- /dev/null
+++ b/configs/hw2/common
@@ -0,0 +1 @@
+CONFIG_BLUERETRO_SYSTEM_PARALLEL_1P=y
\ No newline at end of file