diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts
index e567e4da..0422987a 100644
--- a/packages/admin.gbapp/dialogs/AdminDialog.ts
+++ b/packages/admin.gbapp/dialogs/AdminDialog.ts
@@ -421,7 +421,7 @@ export class AdminDialog extends IGBDialog {
 
           min.adminService.setValue(min.instance.instanceId, 'AntiCSRFAttackState', state);
 
-          const redirectUri = urlJoin(min.instance.botEndpoint, min.instance.botId, '/token');
+          const redirectUri = urlJoin(process.env.BOT_URL, min.instance.botId, '/token');
           const url = `https://login.microsoftonline.com/${step.activeDialog.state.authenticatorTenant}/oauth2/authorize?client_id=${min.instance.marketplaceId}&response_type=code&redirect_uri=${redirectUri}&scope=https://graph.microsoft.com/.default&state=${state}&response_mode=query`;
 
           await min.conversationalService.sendText(min, step, Messages[locale].consent(url));
diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
index d14963ce..b69f86c8 100644
--- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
+++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts
@@ -455,7 +455,7 @@ export class AzureDeployerService implements IGBInstallationDeployer {
     };
 
     GBLog.info(`Deploying Bot...`);
-    instance.botEndpoint = this.defaultEndPoint;
+    instance.botEndpoint = 'TODO: remove this column.';
 
     instance = await this.internalDeployBot(
       instance,
diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
index b4e5f960..028dc3d5 100644
--- a/packages/core.gbapp/services/GBMinService.ts
+++ b/packages/core.gbapp/services/GBMinService.ts
@@ -542,7 +542,7 @@ export class GBMinService {
 
       authenticationContext.acquireTokenWithAuthorizationCode(
         req.query.code,
-        urlJoin(instance.botEndpoint, min.instance.botId, '/token'),
+        urlJoin(process.env.BOT_URL, min.instance.botId, '/token'),
         resource,
         instance.marketplaceId,
         instance.marketplacePassword,
@@ -561,7 +561,7 @@ export class GBMinService {
 
             // Inform the home for default .gbui after finishing token retrival.
 
-            res.redirect(min.instance.botEndpoint);
+            res.redirect(process.env.BOT_URL);
           }
         }
       );
@@ -581,7 +581,7 @@ export class GBMinService {
       );
       authorizationUrl = `${authorizationUrl}?response_type=code&client_id=${
         min.instance.marketplaceId
-      }&redirect_uri=${urlJoin(min.instance.botEndpoint, min.instance.botId, 'token')}`;
+      }&redirect_uri=${urlJoin(process.env.BOT_URL, min.instance.botId, 'token')}`;
       GBLog.info(`HandleOAuthRequests: ${authorizationUrl}.`);
       res.redirect(authorizationUrl);
     });