diff --git a/.github/workflows/e2e_comment.yml b/.github/workflows/e2e_comment.yml
index 5ef1c8c1..53fd1c1c 100644
--- a/.github/workflows/e2e_comment.yml
+++ b/.github/workflows/e2e_comment.yml
@@ -6,7 +6,7 @@ on:
       - completed
 jobs:
   e2e_comment:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     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 e4391907..daa2db2e 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -14,10 +14,8 @@ jobs:
     strategy:
       matrix:
         os:
-          #- macos-latest
-          #- ubuntu-latest
-          - self-hosted
-          #- macos-latest
+          - macos-latest
+          - ubuntu-latest
           #TODO re-enable these:
           #- windows-latest
       fail-fast: false
@@ -120,7 +118,7 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock', 'app/yarn.lock') }}
 
   build-linux-arm:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         include: