diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5e477fb7..fac01d72 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-selfhosted
+    runs-on: self-hosted
 
     strategy:
       fail-fast: false
diff --git a/.github/workflows/e2e_comment.yml b/.github/workflows/e2e_comment.yml
index a6e22330..5ef1c8c1 100644
--- a/.github/workflows/e2e_comment.yml
+++ b/.github/workflows/e2e_comment.yml
@@ -6,7 +6,7 @@ on:
       - completed
 jobs:
   e2e_comment:
-    runs-on: ubuntu-selfhosted
+    runs-on: self-hosted
     if: github.event.workflow_run.event == 'pull_request'
     steps:
       - name: Dump Workflow run info from GitHub context
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 25c5b606..f2fc10f2 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -16,7 +16,7 @@ jobs:
         os:
           #- macos-latest
           #- ubuntu-latest
-          - ubuntu-selfhosted
+          - self-hosted
           #- macos-latest
           #TODO re-enable these:
           #- windows-latest
@@ -121,7 +121,7 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock', 'app/yarn.lock') }}
 
   build-linux-arm:
-    runs-on: ubuntu-selfhosted
+    runs-on: self-hosted
     strategy:
       matrix:
         include: