diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ec614e91..63621a0f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -47,9 +47,9 @@ jobs:
           command: check bans licenses sources
           manifest-path: libraries/rawkit/Cargo.toml
 
-  # Full build and tests on self-hosted runner
+  # Build the web app on the self-hosted wasm runner
   build:
-    runs-on: self-hosted
+    runs-on: [self-hosted, target/wasm]
     permissions:
       contents: write
       deployments: write
@@ -121,6 +121,32 @@ jobs:
           cd frontend
           npm run lint
 
+  # Run the Rust tests on the self-hosted native runner
+  test:
+    runs-on: [self-hosted, target/native]
+    env:
+      RUSTC_WRAPPER: /usr/bin/sccache
+      CARGO_INCREMENTAL: 0
+      SCCACHE_DIR: /var/lib/github-actions/.cache
+
+    steps:
+      - name: 📥 Clone and checkout repository
+        uses: actions/checkout@v3
+
+      - name: 🚦 Check if CI can be skipped
+        id: skip-check
+        uses: cariad-tech/merge-queue-ci-skipper@main
+
+      - name: 🦀 Install the latest Rust
+        if: steps.skip-check.outputs.skip-check != 'true'
+        run: |
+          rustup update stable
+
+      - name: 🦀 Fetch Rust dependencies
+        if: steps.skip-check.outputs.skip-check != 'true'
+        run: |
+          cargo fetch --locked
+
       - name: 🧪 Run Rust tests
         if: steps.skip-check.outputs.skip-check != 'true'
         env:
diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-master.yml
index 64ece22e..852af0ad 100644
--- a/.github/workflows/deploy-master.yml
+++ b/.github/workflows/deploy-master.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   deploy:
-    runs-on: self-hosted
+    runs-on: [self-hosted, target/wasm]
     permissions:
       contents: write
       deployments: write