diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index d4436b86e6a..c897cae9464 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -50,6 +50,10 @@ jobs:
           - name: Shared MPMs, all-modules
             config: --enable-mods-shared=reallyall --enable-mpms-shared=all
           # -------------------------------------------------------------------------
+          - name: Shared MPMs, all-modules
+            config: --enable-mods-shared=reallyall --enable-mpms-shared=all
+            os: ubuntu-22.04-arm64
+          # -------------------------------------------------------------------------
           - name: Event MPM, all-modules, mod_cgid only
             config: --enable-mods-shared=reallyall --with-mpm=event --disable-cgi
           # -------------------------------------------------------------------------
@@ -312,7 +316,7 @@ jobs:
               APU_CONFIG="--without-crypto"
             pkgs: subversion
           # -------------------------------------------------------------------------
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os == '' && 'ubuntu-latest' || matrix.os }}
     timeout-minutes: 30
     env:
       NOTEST_CFLAGS: ${{ matrix.notest-cflags }}
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index ac9cb119a8a..3e861189b3f 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -8,13 +8,6 @@ on:
       - STATUS
       - CHANGES
       - changes-entries/*
-  pull_request:
-    branches: [ "trunk", "2.4.x" ]
-    paths-ignore:
-      - 'docs/**'
-      - STATUS
-      - CHANGES
-      - changes-entries/*
 
 jobs:
   build: