diff --git a/AABrowserAPI/TeamSetup.js b/AABrowserAPI/TeamSetup.js
index 6683a74ba..fc452151f 100644
--- a/AABrowserAPI/TeamSetup.js
+++ b/AABrowserAPI/TeamSetup.js
@@ -524,11 +524,7 @@
                     const graphqlClient = require('graphql-client')
 
                     const usersModuleAPI = graphqlClient({
-                        //url: 'http://localhost:4000/graphql'
-                        url: 'https://app-api.advancedalgos.net/graphql',
-                        //headers: {
-                        //     Authorization: 'Bearer ' + authToken
-                        //}
+                        url: window.canvasApp.urlPrefix
                     });
 
 
@@ -1017,11 +1013,7 @@
                     const graphqlClient = require('graphql-client')
 
                     const usersModuleAPI = graphqlClient({
-                        //url: 'http://localhost:4000/graphql'
-                        url: 'https://app-api.advancedalgos.net/graphql',
-                        //headers: {
-                        //     Authorization: 'Bearer ' + authToken
-                        //}
+                        url: window.canvasApp.urlPrefix
                     });
 
 
diff --git a/Server/Exchange/ExchangeAPI.js b/Server/Exchange/ExchangeAPI.js
index 6cd8a0f80..bdffa2ddb 100644
--- a/Server/Exchange/ExchangeAPI.js
+++ b/Server/Exchange/ExchangeAPI.js
@@ -9,8 +9,9 @@
     const isValidOrder = require('./exchangeUtils').isValidOrder;
     const graphqlClient = require('graphql-client')
 
-    const MASTER_APP_API = 'https://app-api.advancedalgos.net/graphql';
-
+    //const MASTER_APP_API = 'https://app-api.advancedalgos.net/graphql';
+    const MASTER_APP_API = 'http://localhost:4100/graphql';
+    
     let MODULE_NAME = "Exchange API";
 
     let thisObject = {
diff --git a/TopSpace/Login.js b/TopSpace/Login.js
index 39013d97f..f5acb5855 100644
--- a/TopSpace/Login.js
+++ b/TopSpace/Login.js
@@ -21,8 +21,6 @@ function newLogin() {
     container.isDraggeable = false;
     container.isClickeable = true;
 
-    const MASTER_APP_API = 'https://app-api.advancedalgos.net/graphql';
-
     let currentLabel;
 
     let userAuthorization;
@@ -52,7 +50,7 @@ function newLogin() {
 
         const apolloClient = new Apollo.lib.ApolloClient({
             networkInterface: Apollo.lib.createNetworkInterface({
-                uri: MASTER_APP_API,
+                uri: window.canvasApp.urlPrefix,
                 transportBatching: true,
             }),
             connectToDevTools: true,
@@ -104,7 +102,7 @@ function newLogin() {
             }   
 
             const networkInterfaceTeams = Apollo.lib.createNetworkInterface({
-                uri: MASTER_APP_API
+                uri: window.canvasApp.urlPrefix
             });
 
             networkInterfaceTeams.use([{