diff --git a/.circleci/workflows.yml b/.circleci/workflows.yml
index 79c4f8933ca2..be199c54b5ca 100644
--- a/.circleci/workflows.yml
+++ b/.circleci/workflows.yml
@@ -32,7 +32,7 @@ mainBuildFilters: &mainBuildFilters
         - 'update-v8-snapshot-cache-on-develop'
         - 'chore/update_vue_test_utils'
         - 'publish-binary'
-        - 'cacie/29590/document-domain-subdomains'
+        - 'chore/fix_windows_kitchensink'
 
 # usually we don't build Mac app - it takes a long time
 # but sometimes we want to really confirm we are doing the right thing
@@ -80,7 +80,7 @@ windowsWorkflowFilters: &windows-workflow-filters
     # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
     - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
     - equal: [ 'ryanm/chore/electron-33-upgrade', << pipeline.git.branch >> ]
-    - equal: [ 'cacie/fix-hook-test-stack-analysis', << pipeline.git.branch >> ]
+    - equal: [ 'chore/fix_windows_kitchensink', << pipeline.git.branch >> ]
     - matches:
         pattern: /^release\/\d+\.\d+\.\d+$/
         value: << pipeline.git.branch >>
@@ -156,7 +156,7 @@ commands:
           name: Set environment variable to determine whether or not to persist artifacts
           command: |
             echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
-            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "chore/update_vue_test_utils" && "$CIRCLE_BRANCH" != cacie/fix-hook-test-stack-analysis ]]; then
+            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "chore/update_vue_test_utils" && "$CIRCLE_BRANCH" != chore/fix_windows_kitchensink ]]; then
                 export SHOULD_PERSIST_ARTIFACTS=true
             fi' >> "$BASH_ENV"
   # You must run `setup_should_persist_artifacts` command and be using bash before running this command
@@ -951,6 +951,12 @@ commands:
           working_directory: /tmp/<<parameters.repo>>
           command: <<parameters.server-start-command>>
           background: true
+      - run:
+          condition: <<parameters.wait-on>>
+          name: "Waiting on server to boot: <<parameters.wait-on>>"
+          command: |
+            npm i -g wait-on
+            npx wait-on <<parameters.wait-on>> --timeout 120000
       - when:
           condition: <<parameters.folder>>
           steps:
@@ -1117,6 +1123,7 @@ commands:
           condition: <<parameters.wait-on>>
           name: "Waiting on server to boot: <<parameters.wait-on>>"
           command: |
+            npm i -g wait-on
             npx wait-on <<parameters.wait-on>> --timeout 120000
       - windows-install-chrome:
           browser: <<parameters.browser>>
@@ -2715,6 +2722,7 @@ jobs:
       - test-binary-against-repo:
           repo: cypress-example-kitchensink
           browser: electron
+          wait-on: http://localhost:8080
 
   test-binary-against-kitchensink-firefox:
     <<: *defaults
@@ -2722,6 +2730,7 @@ jobs:
       - test-binary-against-repo:
           repo: cypress-example-kitchensink
           browser: firefox
+          wait-on: http://localhost:8080
 
   test-binary-against-kitchensink-chrome:
     <<: *defaults
@@ -2729,6 +2738,7 @@ jobs:
       - test-binary-against-repo:
           repo: cypress-example-kitchensink
           browser: chrome
+          wait-on: http://localhost:8080
 
   test-binary-against-todomvc-firefox:
     <<: *defaults
@@ -2769,7 +2779,6 @@ jobs:
       - test-binary-against-rwa:
           repo: cypress-realworld-app
           browser: chrome
-          wait-on: http://localhost:3000
 
   test-binary-as-specific-user:
     <<: *defaults