diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts
index 1b75a8f3e..7b8dbbd28 100644
--- a/packages/core.gbapp/services/GBDeployer.ts
+++ b/packages/core.gbapp/services/GBDeployer.ts
@@ -522,7 +522,7 @@ export class GBDeployer implements IGBDeployer {
         secretKey: process.env.DRIVE_SECRET,
       });
 
-      const bucketName =  process.env.DRIVE_ORG_PREFIX + min.botId + '.gbai';
+      const bucketName =  (process.env.DRIVE_ORG_PREFIX + min.botId + '.gbai').toLowerCase();
 
       if (!(await GBUtil.exists(localPath))) {
         await fs.mkdir(localPath, { recursive: true });
diff --git a/packages/saas.gbapp/service/GBOService.ts b/packages/saas.gbapp/service/GBOService.ts
index e9a51b323..47bf333f3 100755
--- a/packages/saas.gbapp/service/GBOService.ts
+++ b/packages/saas.gbapp/service/GBOService.ts
@@ -188,7 +188,7 @@ export class GBOService {
       });
 
       
-      const bucketName  = `${process.env.DRIVE_ORG_PREFIX}${botName}.gbai`;
+      const bucketName  = `${process.env.DRIVE_ORG_PREFIX}${botName}.gbai`.toLowerCase();
       const packageName = `${templateName.split('.')[0]}.${kind}`;
       const localTemplatePath = path.join(process.env.PWD, 'templates', templateName, packageName);
       const minioDestinationPath = `${botName}.${kind}`;
@@ -380,7 +380,7 @@ export class GBOService {
 
       // Ensure bucket exists
 
-      name = `${process.env.DRIVE_ORG_PREFIX}${name}`;
+      name = `${process.env.DRIVE_ORG_PREFIX}${name}`.toLowerCase();
       const bucketExists = await minioClient.bucketExists(name);
       if (!bucketExists) {
         await minioClient.makeBucket(name);