diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1a3e92db0e5..6467774afd0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -261,27 +261,15 @@ jobs:
           - target: cross-arm64
             compiler: gcc
             host_os: ubuntu-24.04
-          - target: cross-arm64-amalgamation
-            compiler: gcc
-            host_os: ubuntu-24.04
           - target: cross-ppc64
             compiler: gcc
             host_os: ubuntu-24.04
-          - target: cross-riscv64
-            compiler: gcc
-            host_os: ubuntu-24.04
           - target: cross-mips64
             compiler: gcc
             host_os: ubuntu-24.04
-          - target: cross-s390x
-            compiler: gcc
-            host_os: ubuntu-24.04
           - target: cross-android-arm64
             compiler: clang
             host_os: ubuntu-24.04
-          - target: cross-android-arm64-amalgamation
-            compiler: clang
-            host_os: ubuntu-24.04
           - target: static
             compiler: gcc
             host_os: windows-2022
@@ -289,9 +277,6 @@ jobs:
           - target: cross-ios-arm64
             compiler: xcode
             host_os: macos-13
-          - target: emscripten
-            compiler: emcc
-            host_os: macos-14
 
     runs-on: ${{ matrix.host_os }}
 
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index aeb581fe45e..9fa4fee1d86 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -22,6 +22,46 @@ on:
     - cron:  '23 3 * * *'
 
 jobs:
+  x-compile:
+    name: "Cross"
+    strategy:
+      fail-fast: false
+
+      matrix:
+        include:
+          - target: cross-riscv64
+            compiler: gcc
+            host_os: ubuntu-24.04
+          - target: cross-s390x
+            compiler: gcc
+            host_os: ubuntu-24.04
+          - target: cross-android-arm64-amalgamation
+            compiler: clang
+            host_os: ubuntu-24.04
+          - target: cross-arm64-amalgamation
+            compiler: gcc
+            host_os: ubuntu-24.04
+          - target: emscripten
+            compiler: emcc
+            host_os: macos-14
+
+    runs-on: ${{ matrix.host_os }}
+
+    env:
+      ANDROID_NDK: android-ndk-r26
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Build Agent
+        uses: ./.github/actions/setup-build-agent
+        with:
+          target: ${{ matrix.target }}
+          cache-key: ${{ matrix.host_os }}-${{ matrix.compiler }}-xcompile-${{ matrix.target }}
+
+      - name: Build and Test Botan
+        run: python3 ./src/scripts/ci_build.py --cc='${{ matrix.compiler }}' --make-tool='${{ matrix.make_tool }}' --test-results-dir=junit_results ${{ matrix.target }}
+
   clang_tidy:
     name: "clang-tidy"