diff --git a/Common/Server/API/MicrosoftTeamsAPI.ts b/Common/Server/API/MicrosoftTeamsAPI.ts
index ab1fd4c797..f3c7168258 100644
--- a/Common/Server/API/MicrosoftTeamsAPI.ts
+++ b/Common/Server/API/MicrosoftTeamsAPI.ts
@@ -56,7 +56,7 @@ export default class MicrosoftTeamsAPI {
       $schema:
         "https://developer.microsoft.com/json-schemas/teams/v1.13/MicrosoftTeams.schema.json",
       manifestVersion: "1.13",
-      version: AppVersion || "1.0.0",
+      version: AppVersion.toLowerCase().includes("unknown") ? "1.0.0" : AppVersion,
       id: MicrosoftTeamsAppClientId || "{{MICROSOFT_TEAMS_APP_CLIENT_ID}}",
       packageName: "com.oneuptime.teams",
       developer: {
diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index e13aed8495..71de7eaf64 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -72,6 +72,9 @@ x-common-variables: &common-variables
 
     SLACK_APP_CLIENT_ID: ${SLACK_APP_CLIENT_ID}
 
+
+    MICROSOFT_TEAMS_APP_CLIENT_ID: ${MICROSOFT_TEAMS_APP_CLIENT_ID}
+
 x-common-ui-variables: &common-ui-variables
     <<: *common-variables   
     IS_SERVER: "false"
@@ -133,7 +136,7 @@ x-common-server-variables: &common-server-variables
     SLACK_APP_SIGNING_SECRET: ${SLACK_APP_SIGNING_SECRET}
 
     # Microsoft Teams Configuration
-    MICROSOFT_TEAMS_APP_CLIENT_ID: ${MICROSOFT_TEAMS_APP_CLIENT_ID}
+    
     MICROSOFT_TEAMS_APP_CLIENT_SECRET: ${MICROSOFT_TEAMS_APP_CLIENT_SECRET}
 
 services: