diff --git a/dashboard/src/config.js b/dashboard/src/config.js
index bf2efe60d7..3fbcd97130 100755
--- a/dashboard/src/config.js
+++ b/dashboard/src/config.js
@@ -10,27 +10,42 @@ let dashboardUrl = null;
 let accountsUrl = null;
 let domain = null;
 
+// if (!isServer) {
+//     if (window.location.href.indexOf('localhost') > -1) {
+//         apiUrl = 'http://localhost:3002';
+//         dashboardUrl = 'http://localhost:3000';
+//         accountsUrl = 'http://localhost:3003';
+//         domain = 'localhost';
+//     } else if (window.location.href.indexOf('staging') > -1) {
+//         apiUrl = 'https://staging-api.fyipe.com';
+//         dashboardUrl = 'http://staging-dashboard.fyipe.com';
+//         accountsUrl = 'http://staging-accounts.fyipe.com';
+//         domain = 'fyipe.com';
+//     } else {
+//         apiUrl = 'https://api.fyipe.com';
+//         dashboardUrl = 'https://fyipe.com';
+//         accountsUrl = 'https://accounts.fyipe.com';
+//         domain = 'fyipe.com';
+//     }
+// }
+
+
 if (!isServer) {
     if (window.location.href.indexOf('localhost') > -1) {
         apiUrl = 'http://localhost:3002';
         dashboardUrl = 'http://localhost:3000';
         accountsUrl = 'http://localhost:3003';
         domain = 'localhost';
-    } else if (window.location.href.indexOf('staging') > -1) {
-        apiUrl = 'https://staging-api.fyipe.com';
-        dashboardUrl = 'http://staging-dashboard.fyipe.com';
-        accountsUrl = 'http://staging-accounts.fyipe.com';
-        domain = 'fyipe.com';
     } else {
-        apiUrl = 'https://api.fyipe.com';
-        dashboardUrl = 'https://fyipe.com';
-        accountsUrl = 'https://accounts.fyipe.com';
-        domain = 'fyipe.com';
+        apiUrl = 'http://backend:3002';
+        dashboardUrl = 'http://dashboard:3000';
+        accountsUrl = 'http://accounts:3003';
+        domain = 'local';
     }
-
-
 }
 
+
+
 export const API_URL = apiUrl;
 
 export const DASHBOARD_URL = dashboardUrl;
diff --git a/kubernetes/ci/ci-server.yaml b/kubernetes/ci/ci-server.yaml
index 7fcf928c57..a03b1666cc 100644
--- a/kubernetes/ci/ci-server.yaml
+++ b/kubernetes/ci/ci-server.yaml
@@ -27,11 +27,11 @@ spec:
         - name: FYIPE_HOSTED
           value: "true"
         - name: HOST
-          value: dashboard
+          value: "dashboard"
         - name: ACCOUNTS_HOST
-          value: accounts
+          value: "accounts"
         - name: BACKEND_HOST
-          value: backend
+          value: "backend"
         ports:
         - containerPort: 3000
           hostPort: 3000
@@ -82,11 +82,11 @@ spec:
         - name: FYIPE_HOSTED
           value: "true"
         - name: HOST
-          value: accounts
+          value: "accounts"
         - name: BACKEND_HOST
-          value: backend
+          value: "backend"
         - name: DASHBOARD_HOST
-          value: dashboard
+          value: "dashboard"
         ports:
         - containerPort: 3003
           hostPort: 3003
@@ -145,7 +145,7 @@ spec:
         - name: STRIPE_PRIVATE_KEY
           value: "sk_test_YxwnzywggtAd8jDaHecNmHiN"
         - name: PORT
-          value: "3001"
+          value: "3002"
         - name: MAIL_USER
           value: "testmail@fyipe.com"
         - name: MAIL_PASSWORD
@@ -163,8 +163,8 @@ spec:
         - name: EMAIL_VERIFY_TIME
           value: "3600"
         ports:
-        - containerPort: 3001
-          hostPort: 3001
+        - containerPort: 3002
+          hostPort: 3002
           name: backend
       restartPolicy: Always
       imagePullSecrets:
@@ -181,7 +181,7 @@ spec:
   ports:
   - port: 80
     protocol: TCP
-    targetPort: 3001
+    targetPort: 3002 
   selector:
     app: backend
   type: LoadBalancer
@@ -211,13 +211,13 @@ spec:
         - name: FYIPE_HOSTED
           value: "true"
         - name: HOST
-          value: home
+          value: "home"
         - name: BACKEND_HOST
-          value: backend
+          value: "backend"
         - name: ACCOUNTS_HOST
-          value: accounts
+          value: "accounts"
         - name: DASHBOARD_HOST
-          value: dashboard
+          value: "dashboard"
         ports:
         - containerPort: 1444
           hostPort: 1444
@@ -265,13 +265,13 @@ spec:
         - name: FYIPE_HOSTED
           value: "true"
         - name: HOST
-          value: statusspage
+          value: "statuspage"
         - name: BACKEND_HOST
-          value: backend
+          value: "backend"
         - name: ACCOUNTS_HOST
-          value: accounts
+          value: "accounts"
         - name: DASHBOARD_HOST
-          value: dashboard
+          value: "dashboard"
         ports:
         - containerPort: 3006
           hostPort: 3006
diff --git a/smoke-test/test-utils.js b/smoke-test/test-utils.js
index 971460b0ff..e2fd076966 100644
--- a/smoke-test/test-utils.js
+++ b/smoke-test/test-utils.js
@@ -15,7 +15,7 @@ const puppeteerLaunchConfig = {
 const HOME_URL = process.env.HOME_URL ?  'http://home:1444' : 'http://localhost:1444';
 const ACCOUNTS_URL = process.env.ACCOUNTS_URL ? 'http://accounts:3003' : 'http://localhost:3003';
 const DASHBOARD_URL = process.env.DASHBOARD_URL ? 'http://dashboard:3000' : 'http://localhost:3000';
-const BACKEND_URL = process.env.BACKEND_URL ? 'http://backend:3001' : 'http://localhost:3002';
+const BACKEND_URL = process.env.BACKEND_URL ? 'http://backend:3002' : 'http://localhost:3002';
 const STATUSPAGE_URL = process.env.STATUSPAGE_URL ? 'http://statuspage:3006' : 'http://localhost:3006';
 const APIDOCS_URL = process.env.APIDOCS_URL || 'http://localhost:1445';