diff --git a/.drone.yml b/.drone.yml
index a75220205a..050108254d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -120,7 +120,7 @@ steps:
         from_secret: cypress_project_key
     commands:
       - sed -i 's/localhost/api/g' dist/index.html
-      - yarn serve:dist & npx wait-on http://localhost:5000
+      - yarn serve:dist & npx wait-on http://localhost:4173
       - yarn test:frontend --browser chrome --record
     depends_on:
       - dependencies
diff --git a/cypress.json b/cypress.json
index 28fd022c1e..48eb6ac59d 100644
--- a/cypress.json
+++ b/cypress.json
@@ -1,5 +1,5 @@
 {
-  "baseUrl": "http://localhost:5000",
+  "baseUrl": "http://localhost:4173",
   "env": {
     "API_URL": "http://localhost:3456/api/v1",
     "TEST_SECRET": "averyLongSecretToSe33dtheDB"
diff --git a/package.json b/package.json
index ecb746e627..538fed2d30 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "serve": "vite",
     "serve:dist-dev": "node scripts/serve-dist.js",
-    "serve:dist": "vite preview",
+    "serve:dist": "vite preview --port 4173",
     "build": "vite build && workbox copyLibraries dist/",
     "build:modern-only": "BUILD_MODERN_ONLY=true vite build && workbox copyLibraries dist/",
     "build:dev": "vite build -m development --outDir dist-dev/",
diff --git a/scripts/serve-dist.js b/scripts/serve-dist.js
index e0303dd7fe..f6e092e5f6 100644
--- a/scripts/serve-dist.js
+++ b/scripts/serve-dist.js
@@ -3,7 +3,7 @@ const express = require('express')
 const app = express()
 
 const p = path.join(__dirname, '..', 'dist-dev')
-const port = 5000
+const port = 4173
 
 app.use(express.static(p))
 // Handle urls set by the frontend
diff --git a/vite.config.ts b/vite.config.ts
index e1679ef678..8e9715f939 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -130,7 +130,7 @@ export default defineConfig({
 		extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue'],
 	},
 	server: {
-		port: 5000,
+		port: 4173,
 		strictPort: true,
 	},
 	build: {