diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a3dfa52..b72c4d9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,11 +10,12 @@ on:
 
 jobs:
   build:
-    runs-on: [self-hosted, linux, ARM64]
+    runs-on: ${{ matrix.os }}
 
     strategy:
       matrix:
         os: [windows-2019, macos-13, ubuntu-20.04]
+        arch: [aarch64, amd64]
 
     steps:
       - uses: actions/checkout@v2
@@ -81,18 +82,16 @@ jobs:
         if: matrix.os == 'macos-13' || matrix.os == 'ubuntu-20.04'
         run: |
           echo "VERSION=$(python Movie_Data_Capture.py --version)" >> $GITHUB_ENV
-          echo "ARCH=$(arch)" >> $GITHUB_ENV
 
       - name: Set VERSION variable for windows
         if: matrix.os == 'windows-2019'
         run: |
           echo "VERSION=$(python Movie_Data_Capture.py --version)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          echo "ARCH=$env:PROCESSOR_ARCHITECTURE" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Upload build artifact
         uses: actions/upload-artifact@v1
         with:
-          name: MDC-${{ env.VERSION }}-${{ runner.os }}-${{ env.ARCH }}
+          name: MDC-${{ env.VERSION }}-${{ runner.os }}-${{ runner.arch }}
           path: dist
 
       - name: Run test (Ubuntu & MacOS)