diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml
index 9242c138..a311d997 100644
--- a/.github/workflows/deploy-website.yml
+++ b/.github/workflows/deploy-website.yml
@@ -36,8 +36,10 @@ jobs:
           working-directory: packages/website
           install: false
           record: true
-          start: yarn serve
-          wait-on: "http://127.0.0.1:9000"
+          start: yarn develop
+          wait-on: http://localhost:8000
+          wait-on-timeout: 120
+          config: baseUrl=http://localhost:8000
 
       - name: "Deploy to Skynet"
         uses: skynetlabs/deploy-to-skynet-action@v2
diff --git a/packages/website/cypress.json b/packages/website/cypress.json
index 2954d2f5..b8d2fc61 100644
--- a/packages/website/cypress.json
+++ b/packages/website/cypress.json
@@ -1,5 +1,5 @@
 {
-  "baseUrl": "http://127.0.0.1:9000",
+  "baseUrl": "http://localhost:8000",
   "projectId": "gey76p",
   "videoUploadOnPasses": false
 }