diff --git a/.github/workflows/generate-sandboxes-main.yml b/.github/workflows/generate-sandboxes-main.yml
index 53814040f610..cc17376c57de 100644
--- a/.github/workflows/generate-sandboxes-main.yml
+++ b/.github/workflows/generate-sandboxes-main.yml
@@ -43,7 +43,7 @@ jobs:
         run: yarn local-registry --open &
         working-directory: ./code
       - name: Wait for registry
-        run: yarn wait-on http://localhost:6001
+        run: yarn wait-on tcp:127.0.0.1:6001
         working-directory: ./code
       - name: Generate
         run: yarn generate-sandboxes --local-registry
diff --git a/.github/workflows/generate-sandboxes-next.yml b/.github/workflows/generate-sandboxes-next.yml
index d9355f593dc8..2c0b592d024f 100644
--- a/.github/workflows/generate-sandboxes-next.yml
+++ b/.github/workflows/generate-sandboxes-next.yml
@@ -43,7 +43,7 @@ jobs:
         run: yarn local-registry --open &
         working-directory: ./code
       - name: Wait for registry
-        run: yarn wait-on http://localhost:6001
+        run: yarn wait-on tcp:127.0.0.1:6001
         working-directory: ./code
       - name: Generate
         run: yarn generate-sandboxes --local-registry --debug
diff --git a/scripts/tasks/run-registry.ts b/scripts/tasks/run-registry.ts
index 46cac80599e5..cdf6d4a227a1 100644
--- a/scripts/tasks/run-registry.ts
+++ b/scripts/tasks/run-registry.ts
@@ -15,7 +15,7 @@ export async function runRegistry({ dryRun, debug }: { dryRun?: boolean; debug?:
     // If aborted, we want to make sure the rejection is handled.
     if (!err.killed) throw err;
   });
-  await exec('yarn wait-on http://localhost:6001', { cwd: CODE_DIRECTORY }, { dryRun, debug });
+  await exec('yarn wait-on tcp:127.0.0.1:6001', { cwd: CODE_DIRECTORY }, { dryRun, debug });
 
   return controller;
 }
diff --git a/scripts/tasks/serve.ts b/scripts/tasks/serve.ts
index 2b3a5cc8c4b9..609132261380 100644
--- a/scripts/tasks/serve.ts
+++ b/scripts/tasks/serve.ts
@@ -27,7 +27,7 @@ export const serve: Task = {
         throw err;
       }
     });
-    await waitOn({ resources: [`http://localhost:${PORT}`], interval: 16 });
+    await waitOn({ resources: [`tcp:127.0.0.1:${PORT}`], interval: 16 });
 
     return controller;
   },