diff --git a/packages/core.gbapp/services/GBCoreService.ts b/packages/core.gbapp/services/GBCoreService.ts
index f38c58cc..bf0c3100 100644
--- a/packages/core.gbapp/services/GBCoreService.ts
+++ b/packages/core.gbapp/services/GBCoreService.ts
@@ -423,6 +423,7 @@ ENDPOINT_UPDATE=true
     let instances: IGBInstance[];
     try {
       instances = await core.loadInstances();
+      const group = GBConfigService.get('CLOUD_GROUP')??GBConfigService.get('BOT_ID');
       if (process.env.ENDPOINT_UPDATE === 'true') {
         await CollectionUtil.asyncForEach(instances, async instance => {
           GBLog.info(`Updating bot endpoint for ${instance.botId}...`);
@@ -430,7 +431,7 @@ ENDPOINT_UPDATE=true
 
             await installationDeployer.updateBotProxy(
               instance.botId,
-              GBConfigService.get('BOT_ID'),
+              group,
               `${proxyAddress}/api/messages/${instance.botId}`
             );
           } catch (error) {
diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts
index 77de3f70..641e4de3 100644
--- a/packages/core.gbapp/services/GBDeployer.ts
+++ b/packages/core.gbapp/services/GBDeployer.ts
@@ -267,7 +267,7 @@ export class GBDeployer implements IGBDeployer {
     const username = GBConfigService.get('CLOUD_USERNAME');
     const password = GBConfigService.get('CLOUD_PASSWORD');
     const accessToken = await GBAdminService.getADALTokenFromUsername(username, password);
-    const group = GBConfigService.get('CLOUD_GROUP');
+    const group = GBConfigService.get('CLOUD_GROUP')??GBConfigService.get('BOT_ID');
     const subscriptionId = GBConfigService.get('CLOUD_SUBSCRIPTIONID');
 
     // If the bot already exists, just update the endpoint.