diff --git a/Exchange/ExchangeAPI.js b/Exchange/ExchangeAPI.js
index 664316358..239847557 100644
--- a/Exchange/ExchangeAPI.js
+++ b/Exchange/ExchangeAPI.js
@@ -5,7 +5,7 @@
 
     const MODULE_NAME = "CloudVM -> Exchange API";
 
-    const SERVER_URL = "https://develop.advancedalgos.net/ExchangeAPI/";
+    const SERVER_URL = window.canvasApp.urlPrefix;
     
     let thisObject = {
         initialize: initialize,
diff --git a/Server/Exchange/ExchangeAPI.js b/Server/Exchange/ExchangeAPI.js
index fe3c75257..6cd8a0f80 100644
--- a/Server/Exchange/ExchangeAPI.js
+++ b/Server/Exchange/ExchangeAPI.js
@@ -9,6 +9,8 @@
     const isValidOrder = require('./exchangeUtils').isValidOrder;
     const graphqlClient = require('graphql-client')
 
+    const MASTER_APP_API = 'https://app-api.advancedalgos.net/graphql';
+
     let MODULE_NAME = "Exchange API";
 
     let thisObject = {
@@ -56,7 +58,7 @@
         if (CONSOLE_LOG === true) { console.log("[INFO] createKeyVaultAPIClient -> Entering function."); }
 
         const keyVaultAPI = graphqlClient({
-            url: 'https://keyvault-api.advancedalgos.net/graphql',
+            url: MASTER_APP_API,
             headers: {
                 Authorization: 'Bearer ' + authToken
             }
@@ -70,7 +72,7 @@
             
             keyVaultAPI.query(`
                 mutation($botId: String, $transaction: String!){
-                signTransaction(botId: $botId, transaction: $transaction){
+                keyVault_SignTransaction(botId: $botId, transaction: $transaction){
                     key,
                     signature,
                     date
@@ -84,8 +86,8 @@
                         next(undefined, 'Error from graphql: ' + res.errors);
                     } else {
                         let signature = {
-                            Key: res.data.signTransaction.key,
-                            Sign: res.data.signTransaction.signature
+                            Key: res.data.keyVault_SignTransaction.key,
+                            Sign: res.data.keyVault_SignTransaction.signature
                         }
                         next(signature)
                     }