diff --git a/packages/builder/cypress.json b/packages/builder/cypress.json
index 048e1af10a..669ee5af34 100644
--- a/packages/builder/cypress.json
+++ b/packages/builder/cypress.json
@@ -1,9 +1,9 @@
 {
-  "baseUrl": "http://localhost:4001/builder/",
+  "baseUrl": "http://localhost:10000/builder/",
   "video": true,
   "projectId": "bmbemn",
   "env": {
-    "PORT": "4001",
+    "PORT": "10000",
     "JWT_SECRET": "test"
   }
 }
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 7c9f52c205..7a1594d124 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -15,8 +15,8 @@
     "cy:run": "cypress run",
     "cy:open": "cypress open",
     "cy:run:ci": "cypress run --browser electron --record --key f308590b-6070-41af-b970-794a3823d451",
-    "cy:test": "start-server-and-test cy:setup http://localhost:4001/builder cy:run",
-    "cy:ci": "start-server-and-test cy:setup http://localhost:4001/builder cy:run:ci"
+    "cy:test": "start-server-and-test cy:setup http://localhost:10000/builder cy:run",
+    "cy:ci": "start-server-and-test cy:setup http://localhost:10000/builder cy:run:ci"
   },
   "jest": {
     "globals": {
diff --git a/packages/builder/src/builderStore/api.js b/packages/builder/src/builderStore/api.js
index f359db60aa..0202c5e8ab 100644
--- a/packages/builder/src/builderStore/api.js
+++ b/packages/builder/src/builderStore/api.js
@@ -8,8 +8,7 @@ const apiCall = method => async (
 ) => {
   headers["x-budibase-app-id"] = svelteGet(store).appId
   const json = headers["Content-Type"] === "application/json"
-  const fullUrl = `http://192.168.1.175:4001${url}`
-  return await fetch(fullUrl, {
+  return await fetch(url, {
     method: method,
     body: json ? JSON.stringify(body) : body,
     headers,
diff --git a/packages/server/src/api/controllers/static/index.js b/packages/server/src/api/controllers/static/index.js
index fadb532e03..1bc9c7c6f2 100644
--- a/packages/server/src/api/controllers/static/index.js
+++ b/packages/server/src/api/controllers/static/index.js
@@ -130,11 +130,11 @@ exports.serveAttachment = async function(ctx) {
 
 exports.serveAppAsset = async function(ctx) {
   // TODO: can we just always serve this locally? is anything in S3?
-  if (env.isDev() || env.isTest()) {
-    const builderPath = resolve(__dirname, "../../../../builder/assets")
-    return send(ctx, ctx.file, { root: builderPath })
-  }
-  await returnObjectStoreFile(ctx, join(ctx.user.appId, "public", ctx.file))
+  // if (env.isDev() || env.isTest()) {
+  const builderPath = resolve(__dirname, "../../../../builder/assets")
+  return send(ctx, ctx.file, { root: builderPath })
+  // }
+  // await returnObjectStoreFile(ctx, join(ctx.user.appId, "public", ctx.file))
 }
 
 exports.serveComponentLibrary = async function(ctx) {