diff --git a/.github/workflows/ARM.yml b/.github/workflows/ARM.yml
deleted file mode 100644
index c2b89edfe..000000000
--- a/.github/workflows/ARM.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: Main (ARM)
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-jobs:
-  build-test-arm:
-    name: Build and Test ARM64
-    runs-on: [self-hosted, linux, ARM64]
-    timeout-minutes: 15
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: '8.0.x'
-
-      - name: Clean previous install
-        run: |
-          pip uninstall -y pythonnet
-
-      - name: Install dependencies
-        run: |
-          pip3.8 install -r requirements.txt
-          pip3.8 install pytest numpy # for tests
-
-      - name: Build and Install
-        run: |
-          pip3.8 install -v .
-
-      - name: Set Python DLL path (non Windows)
-        run: |
-          echo PYTHONNET_PYDLL=$(python3.8 -m find_libpython) >> $GITHUB_ENV
-
-      - name: Embedding tests
-        run: dotnet test --logger "console;verbosity=detailed" src/embed_tests/
-
-      - name: Python Tests (Mono)
-        run: python3.8 -m pytest --runtime mono
-
-      - name: Python Tests (.NET Core)
-        run: python3.8 -m pytest --runtime coreclr
-
-      - name: Python tests run from .NET
-        run: dotnet test src/python_tests_runner/
-
-      #- name: Perf tests
-      #  run: |
-      #    pip install --force --no-deps --target src/perf_tests/baseline/ pythonnet==2.5.2
-      #    dotnet test --configuration Release --logger "console;verbosity=detailed" src/perf_tests/
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ea6b2c99a..93c76064a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,6 +28,10 @@ jobs:
             platform: x64
             instance: ubuntu-22.04
 
+          - category: ubuntu
+            platform: arm64
+            instance: ubuntu-22.04-arm
+
           - category: macos
             platform: x64
             instance: macos-13