diff --git a/AABrowserAPI/TeamSetup.js b/AABrowserAPI/TeamSetup.js
index 6683a74ba..b3f3cc437 100644
--- a/AABrowserAPI/TeamSetup.js
+++ b/AABrowserAPI/TeamSetup.js
@@ -6,6 +6,8 @@
         initialize: initialize
     }
 
+    const MASTER_APP_API = 'https://app-api.advancedalgos.net/graphql';
+
     let storage;
 
     return thisObject;
@@ -524,11 +526,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: MASTER_APP_API
                     });
 
 
@@ -1017,11 +1015,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: MASTER_APP_API
                     });
 
 
diff --git a/PlottersManager.js b/PlottersManager.js
index fdd19cc56..0aa834757 100644
--- a/PlottersManager.js
+++ b/PlottersManager.js
@@ -295,7 +295,7 @@
                                     let imageId = participant.devTeam + "." + participant.profilePicture;
 
                                     const TEAM = devTeam.codeName.toLowerCase();
-                                    const STORAGE_URL = "https://algobotcommstorage.blob.core.windows.net";                                  
+                                    const STORAGE_URL = "https://aadevelop.blob.core.windows.net/module-teams";                                  
 
                                     let botAvatar = new Image();
                                     
diff --git a/Server/Exchange/ExchangeAPI.js b/Server/Exchange/ExchangeAPI.js
index 6cd8a0f80..203259e3a 100644
--- a/Server/Exchange/ExchangeAPI.js
+++ b/Server/Exchange/ExchangeAPI.js
@@ -10,7 +10,8 @@
     const graphqlClient = require('graphql-client')
 
     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 = {