diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 9d30b0b..5f9e722 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -25,7 +25,7 @@ jobs:
           - Ninja
         configuration:
           - Release
-    # runs-on: [self-hosted, macOS]
+    # runs-on: [self-hosted, macOS] # runs-on: [self-hosted, macOS] # TODO: Use self-host when https://ripplelabs.atlassian.net/browse/RXIT-210 resolved
     runs-on: macos-latest
     env:
       # The `build` action requires these variables.
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index e27037f..02f3435 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -59,7 +59,7 @@ jobs:
               cc: /usr/bin/clang-14
               cxx: /usr/bin/clang++-14
     name: ${{ matrix.compiler }}-${{ matrix.profile.version }} - ${{ matrix.configuration }}
-    # runs-on: [self-hosted, x-heavy]
+    # runs-on: [self-hosted, x-heavy] # TODO: Use self-host when https://ripplelabs.atlassian.net/browse/RXIT-210 resolved
     runs-on: ubuntu-latest
     container: rippleci/rippled-build-ubuntu:aaf5e3e
     env:
@@ -117,7 +117,8 @@ jobs:
           - ""
     name: Test ${{ matrix.compiler }}-${{ matrix.configuration }}
     needs: dependencies
-    runs-on: [self-hosted, x-heavy]
+    # runs-on: [self-hosted, x-heavy] # TODO: Use self-host when https://ripplelabs.atlassian.net/browse/RXIT-210 resolved
+    runs-on: ubuntu-20.04
     container: rippleci/rippled-build-ubuntu:aaf5e3e
     env:
       build_dir: .build