diff --git a/samples/app-complete-auth/csharp/AppCompleteAuth/Pages/config.cshtml b/samples/app-complete-auth/csharp/AppCompleteAuth/Pages/config.cshtml
index 1c9621a33f..fa6358667f 100644
--- a/samples/app-complete-auth/csharp/AppCompleteAuth/Pages/config.cshtml
+++ b/samples/app-complete-auth/csharp/AppCompleteAuth/Pages/config.cshtml
@@ -10,17 +10,20 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
     <script>
+
         microsoftTeams.app.initialize().then(() => {
-            function ssoLogin(){
-                microsoftTeams.authentication.notifySuccess('sso');
-            }
-            function facebookLogin() {
-                microsoftTeams.authentication.notifySuccess('facebooklogin');
-            }
-            function usingCredentialsLogin() {
-                microsoftTeams.authentication.notifySuccess('usercredentials');
-            }
         });
+        
+        function ssoLogin(){
+            microsoftTeams.authentication.notifySuccess('sso');
+        }
+        function facebookLogin() {
+            microsoftTeams.authentication.notifySuccess('facebooklogin');
+        }
+        function usingCredentialsLogin() {
+            microsoftTeams.authentication.notifySuccess('usercredentials');
+        }
+        
     </script>
   
     <style>
diff --git a/samples/app-complete-auth/nodejs/bots/teamsBot.js b/samples/app-complete-auth/nodejs/bots/teamsBot.js
index 541d85c434..6fe146bdb0 100644
--- a/samples/app-complete-auth/nodejs/bots/teamsBot.js
+++ b/samples/app-complete-auth/nodejs/bots/teamsBot.js
@@ -760,6 +760,16 @@ class TeamsBot extends DialogBot {
         type: 'AdaptiveCard',
         version: '1.4'
     });
+
+    async handleTeamsSigninVerifyState(context, query) {
+        console.log('Running dialog with signin/verifystate from an Invoke Activity.');
+        await this.dialog.run(context, this.dialogState);
+    }
+
+    async handleTeamsSigninTokenExchange(context, query) {
+        console.log('Running dialog with signin/tokenExchange from an Invoke Activity.');
+        await this.dialog.run(context, this.dialogState);
+    }
 }
 
 module.exports.TeamsBot = TeamsBot;
\ No newline at end of file
diff --git a/samples/app-complete-auth/nodejs/views/config.ejs b/samples/app-complete-auth/nodejs/views/config.ejs
index c90b4cb876..fd4bd8fc14 100644
--- a/samples/app-complete-auth/nodejs/views/config.ejs
+++ b/samples/app-complete-auth/nodejs/views/config.ejs
@@ -7,7 +7,10 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js"></script>
     <script>
-      microsoftTeams.app.initialize().then(() => {
+
+        microsoftTeams.app.initialize().then(() => {
+        });
+      
         function ssoLogin(){
             microsoftTeams.authentication.notifySuccess('sso');
         }
@@ -17,7 +20,7 @@
         function usingCredentialsLogin() {
             microsoftTeams.authentication.notifySuccess('usercredentials');
         }
-      });
+      
     </script>
   
     <style>
diff --git a/samples/app-installation-using-qr-code/csharp/TeamsApp/aad.manifest.json b/samples/app-installation-using-qr-code/csharp/TeamsApp/aad.manifest.json
index d917f9ccc4..eec61cd0d3 100644
--- a/samples/app-installation-using-qr-code/csharp/TeamsApp/aad.manifest.json
+++ b/samples/app-installation-using-qr-code/csharp/TeamsApp/aad.manifest.json
@@ -27,27 +27,11 @@
             "type": "Scope"
           },
           {
-            "id": "AccessReview.ReadWrite.All",
+            "id": "TeamsAppInstallation.ReadWriteAndConsentForTeam",
             "type": "Scope"
           },
           {
-            "id": "Mail.Read",
-            "type": "Scope"
-          },
-          {
-            "id": "Mail.Send",
-            "type": "Scope"
-          },
-          {
-            "id": "openid",
-            "type": "Scope"
-          },
-          {
-            "id": "profile",
-            "type": "Scope"
-          },
-          {
-            "id": "User.ReadBasic.All",
+            "id": "TeamsAppInstallation.ReadWriteAndConsentSelfForTeam",
             "type": "Scope"
           }
         ]
diff --git a/samples/app-link-unfurling-in-share-to-teams/csharp/LinkUnfurlingInShareToTeams/Bots/ActivityBot.cs b/samples/app-link-unfurling-in-share-to-teams/csharp/LinkUnfurlingInShareToTeams/Bots/ActivityBot.cs
index c582d3f839..4c9ceb77a4 100644
--- a/samples/app-link-unfurling-in-share-to-teams/csharp/LinkUnfurlingInShareToTeams/Bots/ActivityBot.cs
+++ b/samples/app-link-unfurling-in-share-to-teams/csharp/LinkUnfurlingInShareToTeams/Bots/ActivityBot.cs
@@ -24,7 +24,7 @@ public class ActivityBot : TeamsActivityHandler
         public ActivityBot(IConfiguration configuration)
         {
             _applicationBaseUrl = configuration["ApplicationBaseUrl"] ?? throw new NullReferenceException("ApplicationBaseUrl");
-            _microsoftAppId= configuration["MicrosoftAppId"] ?? throw new NullReferenceException("MicrosoftAppId");
+            _microsoftAppId= configuration["TeamsAppId"] ?? throw new NullReferenceException("TeamsAppId");
         }
 
         /// <summary>
diff --git a/samples/app-link-unfurling-in-share-to-teams/csharp/LinkUnfurlingInShareToTeams/appsettings.json b/samples/app-link-unfurling-in-share-to-teams/csharp/LinkUnfurlingInShareToTeams/appsettings.json
index ceb756ee46..be6cacf6a5 100644
--- a/samples/app-link-unfurling-in-share-to-teams/csharp/LinkUnfurlingInShareToTeams/appsettings.json
+++ b/samples/app-link-unfurling-in-share-to-teams/csharp/LinkUnfurlingInShareToTeams/appsettings.json
@@ -1,5 +1,6 @@
 {
-  "MicrosoftAppId": "<<Microsoft-App-Id>>",
-  "MicrosoftAppPassword": "<<Microsoft-App-Password>>",
-  "ApplicationBaseUrl": "<<Application-Base-Url>>"
+	"MicrosoftAppId": "",
+	"MicrosoftAppPassword": "",
+	"ApplicationBaseUrl": "",
+	"TeamsAppId": ""
 }
\ No newline at end of file
diff --git a/samples/app-link-unfurling-in-share-to-teams/csharp/TeamsApp/teamsapp.local.yml b/samples/app-link-unfurling-in-share-to-teams/csharp/TeamsApp/teamsapp.local.yml
index fdeb8aaa5c..406c2582e6 100644
--- a/samples/app-link-unfurling-in-share-to-teams/csharp/TeamsApp/teamsapp.local.yml
+++ b/samples/app-link-unfurling-in-share-to-teams/csharp/TeamsApp/teamsapp.local.yml
@@ -45,6 +45,7 @@ provision:
         MicrosoftAppId: ${{AAD_APP_CLIENT_ID}}
         MicrosoftAppPassword: ${{SECRET_AAD_APP_CLIENT_SECRET}}
         ApplicationBaseUrl: ${{BOT_ENDPOINT}}
+        TeamsAppId: ${{TEAMS_APP_ID}}
 
   - uses: arm/deploy # Deploy given ARM templates parallelly.
     with:
diff --git a/samples/app-link-unfurling-in-share-to-teams/nodejs/Images/report.png b/samples/app-link-unfurling-in-share-to-teams/nodejs/Images/report.png
new file mode 100644
index 0000000000..bcf588ac21
Binary files /dev/null and b/samples/app-link-unfurling-in-share-to-teams/nodejs/Images/report.png differ
diff --git a/samples/bot-conversation/python/bots/teams_conversation_bot.py b/samples/bot-conversation/python/bots/teams_conversation_bot.py
index b94b40136f..85a88b1860 100644
--- a/samples/bot-conversation/python/bots/teams_conversation_bot.py
+++ b/samples/bot-conversation/python/bots/teams_conversation_bot.py
@@ -83,7 +83,7 @@ async def _mention_adaptive_card_activity(self, turn_context: TurnContext):
         for e in template_json["msteams"]["entities"]:
             e["text"] = e["text"].replace("${userName}", member.name)
             e["mentioned"]["id"] = e["mentioned"]["id"].replace("${userUPN}", member.user_principal_name)
-            e["mentioned"]["id"] = e["mentioned"]["id"].replace("${userAAD}", member.additional_properties["aadObjectId"])
+            e["mentioned"]["id"] = e["mentioned"]["id"].replace("${userAAD}", member.aad_object_id)
             e["mentioned"]["name"] = e["mentioned"]["name"].replace("${userName}", member.name)
         
         adaptive_card_attachment = Activity(
diff --git a/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/Cards/DependentDropdown.json b/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/Cards/DependentDropdown.json
new file mode 100644
index 0000000000..fb2c11952d
--- /dev/null
+++ b/samples/bot-type-ahead-search-adaptive-cards/csharp/TypeaheadSearch/Cards/DependentDropdown.json
@@ -0,0 +1,61 @@
+{
+  "type": "AdaptiveCard",
+  "$schema": "https://adaptivecards.io/schemas/adaptive-card.json",
+  "version": "1.5",
+  "body": [
+    {
+      "size": "ExtraLarge",
+      "text": "Country Picker",
+      "weight": "Bolder",
+      "wrap": true,
+      "type": "TextBlock"
+    },
+    {
+      "id": "choiceSelect",
+      "type": "Input.ChoiceSet",
+      "label": "Select a country or region:",
+      "choices": [
+        {
+          "title": "USA",
+          "value": "usa"
+        },
+        {
+          "title": "France",
+          "value": "france"
+        },
+        {
+          "title": "India",
+          "value": "india"
+        }
+      ],
+      "valueChangedAction": {
+        "type": "Action.ResetInputs",
+        "targetInputIds": [
+          "city"
+        ]
+      },
+      "isRequired": true,
+      "errorMessage": "Please select a country or region"
+    },
+    {
+      "style": "filtered",
+      "choices.data": {
+        "type": "Data.Query",
+        "dataset": "cities",
+        "associatedInputs": "auto"
+      },
+      "id": "city",
+      "type": "Input.ChoiceSet",
+      "label": "Select a city:",
+      "placeholder": "Type to search for a city in the selected country",
+      "isRequired": true,
+      "errorMessage": "Please select a city"
+    }
+  ],
+  "actions": [
+    {
+      "title": "Submit",
+      "type": "Action.Submit"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/samples/graph-appcatalog-lifecycle/nodejs/Helper/AppCatalog.js b/samples/graph-appcatalog-lifecycle/nodejs/Helper/AppCatalog.js
index 671660fa54..e39c2bf4a7 100644
--- a/samples/graph-appcatalog-lifecycle/nodejs/Helper/AppCatalog.js
+++ b/samples/graph-appcatalog-lifecycle/nodejs/Helper/AppCatalog.js
@@ -73,7 +73,7 @@ class AppCatalogHelper {
         return new Promise(async (resolve) => {
             
             // read a zip file
-            let response = fs.readFile("Manifest/manifest.zip", async (err, data) => {
+            let response = fs.readFile("appManifest/build/appManifest.local.zip", async (err, data) => {
                 if (err) throw err;
                 await JSZip.loadAsync(data).then(async (zip) => {
                     if (headerType == 'publish') {
diff --git a/samples/msgext-link-unfurling-meeting/csharp/Source/Microsoft.Teams.Samples.LinkUnfurling.Web/ClientApp/src/components/ReviewInMeeting.js b/samples/msgext-link-unfurling-meeting/csharp/Source/Microsoft.Teams.Samples.LinkUnfurling.Web/ClientApp/src/components/ReviewInMeeting.js
index b24ed005ed..00a9337841 100644
--- a/samples/msgext-link-unfurling-meeting/csharp/Source/Microsoft.Teams.Samples.LinkUnfurling.Web/ClientApp/src/components/ReviewInMeeting.js
+++ b/samples/msgext-link-unfurling-meeting/csharp/Source/Microsoft.Teams.Samples.LinkUnfurling.Web/ClientApp/src/components/ReviewInMeeting.js
@@ -23,9 +23,13 @@ export class ReviewInMeeting extends Component {
     this.initiateSSO = this.initiateSSO.bind(this);
   }
 
-  componentDidMount() {
-    // Initialize teams library and set context.
-    this.initialize();
+    componentDidMount() {
+        // Initialize teams library and set context.
+        microsoftTeams.initialize();
+        microsoftTeams.getContext((context, error) => {
+        this.setState({ context: context });
+      });
+      microsoftTeams.appInitialization.notifySuccess();
 
     // SSO.
     this.initiateSSO();
@@ -63,19 +67,6 @@ export class ReviewInMeeting extends Component {
     );
   }
 
-  initialize() {
-    // Initialize the Microsoft Teams SDK
-    microsoftTeams.initialize(() => {
-      // Get the user context from Teams and set it in the state
-      microsoftTeams.getContext((context, error) => {
-        this.setState({ context: context });
-      });
-
-      // Notify sucess.
-      microsoftTeams.appInitialization.notifySuccess();
-    });
-  }
-
   initiateSSO() {
     // Get SSO token.
     let authTokenRequestOptions = {
diff --git a/samples/msgext-link-unfurling-meeting/csharp/TeamsApp/aad.manifest.json b/samples/msgext-link-unfurling-meeting/csharp/TeamsApp/aad.manifest.json
index 84ed751add..c1b5ebac13 100644
--- a/samples/msgext-link-unfurling-meeting/csharp/TeamsApp/aad.manifest.json
+++ b/samples/msgext-link-unfurling-meeting/csharp/TeamsApp/aad.manifest.json
@@ -107,9 +107,9 @@
             ]
         }
     ],
-    "identifierUris":[
-        "api://botid-${{AAD_APP_CLIENT_ID}}"
-    ],
+  "identifierUris": [
+    "api://${{BOT_DOMAIN}}/${{AAD_APP_CLIENT_ID}}"
+  ],
   "replyUrlsWithType": [
     {
       "url": "https://${{BOT_DOMAIN}}/auth-end",
diff --git a/samples/tab-deeplink/csharp/DeepLinkBot/Bots/DeepLinkBot.cs b/samples/tab-deeplink/csharp/DeepLinkBot/Bots/DeepLinkBot.cs
index 9ab54e9ddc..9119ec24bd 100644
--- a/samples/tab-deeplink/csharp/DeepLinkBot/Bots/DeepLinkBot.cs
+++ b/samples/tab-deeplink/csharp/DeepLinkBot/Bots/DeepLinkBot.cs
@@ -61,11 +61,11 @@ public Attachment AdaptiveDeepLinkCard(string userName, ITurnContext turnContext
             }
             else
             {
-                tabUrlTask1 = deeplinkHelper.GetDeepLinkToTabTask(teamsUrl, _configuration["ManifestAppId"], _configuration["TabEntityId"], "topic1");
-                tabUrlTask2 = deeplinkHelper.GetDeepLinkToTabTask(teamsUrl, _configuration["ManifestAppId"], _configuration["TabEntityId"], "topic2");
-                tabUrlTask3 = deeplinkHelper.GetDeepLinkToTabTask(teamsUrl, _configuration["ManifestAppId"], _configuration["TabEntityId"], "topic3");
-                extendedDeepLink = deeplinkHelper.GetDeepLinkToTabTask(teamsUrl, _configuration["ManifestAppId"], _configuration["TabEntityId"], "");
-                sidePanelLink = deeplinkHelper.GetDeepLinkToMeetingSidePanel(teamsUrl, _configuration["MicrosoftAppId"], _configuration["BaseURL"], _configuration["ChannelEntityId"], turnContext.Activity.Conversation.Id, "chat");
+                tabUrlTask1 = deeplinkHelper.GetDeepLinkToTabTask(teamsUrl, _configuration["TeamsAppId"], _configuration["TabEntityId"], "topic1");
+                tabUrlTask2 = deeplinkHelper.GetDeepLinkToTabTask(teamsUrl, _configuration["TeamsAppId"], _configuration["TabEntityId"], "topic2");
+                tabUrlTask3 = deeplinkHelper.GetDeepLinkToTabTask(teamsUrl, _configuration["TeamsAppId"], _configuration["TabEntityId"], "topic3");
+                extendedDeepLink = deeplinkHelper.GetDeepLinkToTabTask(teamsUrl, _configuration["TeamsAppId"], _configuration["TabEntityId"], "");
+                sidePanelLink = deeplinkHelper.GetDeepLinkToMeetingSidePanel(teamsUrl, _configuration["TeamsAppId"], _configuration["BaseURL"], _configuration["ChannelEntityId"], turnContext.Activity.Conversation.Id, "chat");
             }
 
             var DeepLinkCard = new AdaptiveCard(new AdaptiveSchemaVersion("1.0"))
diff --git a/samples/tab-deeplink/csharp/DeepLinkBot/Controllers/HomeController.cs b/samples/tab-deeplink/csharp/DeepLinkBot/Controllers/HomeController.cs
index c6ffde447c..b876ef78b4 100644
--- a/samples/tab-deeplink/csharp/DeepLinkBot/Controllers/HomeController.cs
+++ b/samples/tab-deeplink/csharp/DeepLinkBot/Controllers/HomeController.cs
@@ -103,7 +103,7 @@ public ActionResult DeepLinkChannel()
                 channelDeeplinks.Add(task2ChannelLink);
                 channelDeeplinks.Add(task3ChannelLink);
             }
-            ViewBag.AppId = _configuration["MicrosoftAppId"];
+            ViewBag.AppId = _configuration["TeamsAppId"];
             return View(channelDeeplinks);
         }
 
diff --git a/samples/tab-deeplink/csharp/DeepLinkBot/appsettings.json b/samples/tab-deeplink/csharp/DeepLinkBot/appsettings.json
index eb3d48d75a..822776de47 100644
--- a/samples/tab-deeplink/csharp/DeepLinkBot/appsettings.json
+++ b/samples/tab-deeplink/csharp/DeepLinkBot/appsettings.json
@@ -1,8 +1,9 @@
 {
-  "MicrosoftAppId": "<<YOUR-MICROSOFT-APP-ID>>",
-  "MicrosoftAppPassword": "<<YOUR-MICROSOFT-APP-PASSWORD>>",
-  "BaseURL": "YOUR-BASE-URL",
-  "ChannelEntityId": "DeepLinkApp",
-  "TabEntityId": "com.contoso.DeeplLinkBot.help",
-  "ManifestAppId":"Your-ManifestAppID"
+	"TeamsAppId": "",
+	"MicrosoftAppId": "",
+	"MicrosoftAppPassword": "",
+	"BaseURL": "",
+	"ChannelEntityId": "DeepLinkApp",
+	"TabEntityId": "com.contoso.DeeplLinkBot.help",
+	"ManifestAppId": ""
 }
\ No newline at end of file
diff --git a/samples/tab-deeplink/csharp/TeamsApp/teamsapp.local.yml b/samples/tab-deeplink/csharp/TeamsApp/teamsapp.local.yml
index c9fb66712e..57c7321ce0 100644
--- a/samples/tab-deeplink/csharp/TeamsApp/teamsapp.local.yml
+++ b/samples/tab-deeplink/csharp/TeamsApp/teamsapp.local.yml
@@ -42,6 +42,7 @@ provision:
     with:
       target: ../DeepLinkBot/appsettings.json
       content:
+        TeamsAppId: ${{TEAMS_APP_ID}}
         MicrosoftAppId: ${{AAD_APP_CLIENT_ID}}
         MicrosoftAppPassword: ${{SECRET_AAD_APP_CLIENT_SECRET}}
         BaseURL: ${{BOT_DOMAIN}}
diff --git a/samples/tab-deeplink/nodejs/Bots/DeepLinkTabsnode.js b/samples/tab-deeplink/nodejs/Bots/DeepLinkTabsnode.js
index f297cd7424..0e810a7494 100644
--- a/samples/tab-deeplink/nodejs/Bots/DeepLinkTabsnode.js
+++ b/samples/tab-deeplink/nodejs/Bots/DeepLinkTabsnode.js
@@ -13,17 +13,17 @@ class DeepLinkTabsnode extends TeamsActivityHandler {
       let sidePanelLink = "";
 
       if (context.activity.conversation.conversationType === "channel") {
-        var BotsDeepLink = DeepLinkTabHelper.GetDeepLinkTabChannel("topic1", 1, "Bots", context.activity.channelData.teamsChannelId, process.env.MicrosoftAppId, process.env.Channel_Entity_Id);
-        var MessagingDeepLink = DeepLinkTabHelper.GetDeepLinkTabChannel("topic2", 2, "Messaging Extension", context.activity.channelData.teamsChannelId, process.env.MicrosoftAppId, process.env.Channel_Entity_Id);
-        var AdaptiveCardDeepLink = DeepLinkTabHelper.GetDeepLinkTabChannel("topic3", 3, "Adaptive Card", context.activity.channelData.teamsChannelId, process.env.MicrosoftAppId, process.env.Channel_Entity_Id);
-        ExtendedDeepLink = DeepLinkTabHelper.GetDeepLinkTabChannel("", 4, "Extended Deeplink features", context.activity.channelData.teamsChannelId, process.env.MicrosoftAppId, process.env.Channel_Entity_Id);
+        var BotsDeepLink = DeepLinkTabHelper.GetDeepLinkTabChannel("topic1", 1, "Bots", context.activity.channelData.teamsChannelId, process.env.TeamsAppId, process.env.Channel_Entity_Id);
+        var MessagingDeepLink = DeepLinkTabHelper.GetDeepLinkTabChannel("topic2", 2, "Messaging Extension", context.activity.channelData.teamsChannelId, process.env.TeamsAppId, process.env.Channel_Entity_Id);
+        var AdaptiveCardDeepLink = DeepLinkTabHelper.GetDeepLinkTabChannel("topic3", 3, "Adaptive Card", context.activity.channelData.teamsChannelId, process.env.TeamsAppId, process.env.Channel_Entity_Id);
+        ExtendedDeepLink = DeepLinkTabHelper.GetDeepLinkTabChannel("", 4, "Extended Deeplink features", context.activity.channelData.teamsChannelId, process.env.TeamsAppId, process.env.Channel_Entity_Id);
       }
       else {
-        var BotsDeepLink = DeepLinkTabHelper.GetDeepLinkTabStatic("topic1", 1, "Bots", process.env.MicrosoftAppId);
-        var MessagingDeepLink = DeepLinkTabHelper.GetDeepLinkTabStatic("topic2", 2, "Messaging Extension", process.env.MicrosoftAppId);
-        var AdaptiveCardDeepLink = DeepLinkTabHelper.GetDeepLinkTabStatic("topic3", 3, "Adaptive Card", process.env.MicrosoftAppId);
-        ExtendedDeepLink = DeepLinkTabHelper.GetDeepLinkTabStatic("", 4, "Extended Deeplink features", process.env.MicrosoftAppId);
-        sidePanelLink = DeepLinkTabHelper.GetDeepLinkToMeetingSidePanel(5,"Side pannel Deeplink",process.env.MicrosoftAppId, process.env.Base_URL, context.activity.conversation.id, "chat");
+        var BotsDeepLink = DeepLinkTabHelper.GetDeepLinkTabStatic("topic1", 1, "Bots", process.env.TeamsAppId);
+        var MessagingDeepLink = DeepLinkTabHelper.GetDeepLinkTabStatic("topic2", 2, "Messaging Extension", process.env.TeamsAppId);
+        var AdaptiveCardDeepLink = DeepLinkTabHelper.GetDeepLinkTabStatic("topic3", 3, "Adaptive Card", process.env.TeamsAppId);
+        ExtendedDeepLink = DeepLinkTabHelper.GetDeepLinkTabStatic("", 4, "Extended Deeplink features", process.env.TeamsAppId);
+        sidePanelLink = DeepLinkTabHelper.GetDeepLinkToMeetingSidePanel(5,"Side pannel Deeplink",process.env.TeamsAppId, process.env.Base_URL, context.activity.conversation.id, "chat");
       }
 
       await context.sendActivity({ attachments: [this.createAdaptiveCard(conversationType, BotsDeepLink, MessagingDeepLink, AdaptiveCardDeepLink, ExtendedDeepLink, sidePanelLink)] });
diff --git a/samples/tab-deeplink/nodejs/teamsapp.local.yml b/samples/tab-deeplink/nodejs/teamsapp.local.yml
index 92a88361fd..013b1a5933 100644
--- a/samples/tab-deeplink/nodejs/teamsapp.local.yml
+++ b/samples/tab-deeplink/nodejs/teamsapp.local.yml
@@ -85,6 +85,7 @@ deploy:
     with:
       target: ./.env
       envs:
+        TeamsAppId: ${{TEAMS_APP_ID}}
         MicrosoftAppId: ${{AAD_APP_CLIENT_ID}}
         MicrosoftAppPassword: ${{SECRET_AAD_APP_CLIENT_SECRET}}
         Base_URL: ${{BOT_ENDPOINT}}
\ No newline at end of file
diff --git a/samples/tab-stage-view/csharp/TabInStageView/Bots/ActivityBot.cs b/samples/tab-stage-view/csharp/TabInStageView/Bots/ActivityBot.cs
index 58086fb94f..9d7eed5497 100644
--- a/samples/tab-stage-view/csharp/TabInStageView/Bots/ActivityBot.cs
+++ b/samples/tab-stage-view/csharp/TabInStageView/Bots/ActivityBot.cs
@@ -32,7 +32,7 @@ public class ActivityBot : TeamsActivityHandler
         /// <param name="configuration">configuration of application.</param>
         public ActivityBot(IConfiguration configuration)
         {
-            _appId = configuration["MicrosoftAppId"] ?? throw new NullReferenceException("MicrosoftAppId");
+            _appId = configuration["TeamsAppId"] ?? throw new NullReferenceException("MicrosoftAppId");
             _applicationBaseURL = configuration["ApplicationBaseURL"] ?? throw new NullReferenceException("ApplicationBaseURL");
         }
 
diff --git a/samples/tab-stage-view/csharp/TabInStageView/Controllers/HomeController.cs b/samples/tab-stage-view/csharp/TabInStageView/Controllers/HomeController.cs
index f90f56a1ff..28ec852fd7 100644
--- a/samples/tab-stage-view/csharp/TabInStageView/Controllers/HomeController.cs
+++ b/samples/tab-stage-view/csharp/TabInStageView/Controllers/HomeController.cs
@@ -14,7 +14,7 @@ public class HomeController : Controller
         /// <param name="configuration">configuration of application.</param>
         public HomeController(IConfiguration configuration)
         {
-            _appId = configuration["MicrosoftAppId"] ?? throw new NullReferenceException("MicrosoftAppId");
+            _appId = configuration["TeamsAppId"] ?? throw new NullReferenceException("TeamsAppId");
         }
 
         [Route("")]
diff --git a/samples/tab-stage-view/csharp/TeamsApp/teamsapp.local.yml b/samples/tab-stage-view/csharp/TeamsApp/teamsapp.local.yml
index 6bf1fc7068..2ff4ae7429 100644
--- a/samples/tab-stage-view/csharp/TeamsApp/teamsapp.local.yml
+++ b/samples/tab-stage-view/csharp/TeamsApp/teamsapp.local.yml
@@ -45,6 +45,7 @@ provision:
         MicrosoftAppId: ${{AAD_APP_CLIENT_ID}}
         MicrosoftAppPassword: ${{SECRET_AAD_APP_CLIENT_SECRET}}
         ApplicationBaseURL: ${{BOT_ENDPOINT}}
+        TeamsAppId: ${{TEAMS_APP_ID}}
 
   - uses: arm/deploy # Deploy given ARM templates parallelly.
     with:
diff --git a/samples/tab-stage-view/nodejs/server/models/adaptiveCard.js b/samples/tab-stage-view/nodejs/server/models/adaptiveCard.js
index e24024d898..031d154502 100644
--- a/samples/tab-stage-view/nodejs/server/models/adaptiveCard.js
+++ b/samples/tab-stage-view/nodejs/server/models/adaptiveCard.js
@@ -32,7 +32,7 @@ const adaptiveCardForTabStageView = (baseUrlForOpenUrl) => ({
                 {
                    type: "Action.OpenUrl",
                    title: "View via Deep Link",
-                   url: "https://teams.microsoft.com/l/stage/"+process.env.MicrosoftAppId+"/0?context=%7B%22contentUrl%22%3A%22https%3A%2F%2F"+baseUrlForOpenUrl+"%2Fcontent%22%2C%22websiteUrl%22%3A%22https%3A%2F%2F"+baseUrlForOpenUrl+"%2Fcontent%22%2C%22name%22%3A%22DemoStageView%22%7D"
+                   url: "https://teams.microsoft.com/l/stage/"+process.env.TeamsAppId+"/0?context=%7B%22contentUrl%22%3A%22https%3A%2F%2F"+baseUrlForOpenUrl+"%2Fcontent%22%2C%22websiteUrl%22%3A%22https%3A%2F%2F"+baseUrlForOpenUrl+"%2Fcontent%22%2C%22name%22%3A%22DemoStageView%22%7D"
                 }
             ]
         }
diff --git a/samples/tab-stage-view/nodejs/server/views/sampleTab.ejs b/samples/tab-stage-view/nodejs/server/views/sampleTab.ejs
index 3d77ce9863..df32b02526 100644
--- a/samples/tab-stage-view/nodejs/server/views/sampleTab.ejs
+++ b/samples/tab-stage-view/nodejs/server/views/sampleTab.ejs
@@ -13,12 +13,11 @@
         microsoftTeams.app.initialize().then(() => {
         });
         function createLink() {
-            var appId =  "<%-microsoftAppId%>";
+            var appId =  "<%-teamsAppId%>";
             var baseUrl =  "<%-baseUrl%>";
 
             // Passing the values and encoding the url while implementing the deeplink from tab
             let url = "https://teams.microsoft.com/l/stage/"+appId+"/0?context={\"contentUrl\":\""+baseUrl+"/content\",\"websiteUrl\":\""+baseUrl+"/content\",\"name\":\"DemoStageView\"}";
-            alert("URL - " + url);
             microsoftTeams.app.openLink(url);
         };
     </script>
diff --git a/samples/tab-stage-view/nodejs/teamsapp.local.yml b/samples/tab-stage-view/nodejs/teamsapp.local.yml
index b3e781f126..d9a7568a55 100644
--- a/samples/tab-stage-view/nodejs/teamsapp.local.yml
+++ b/samples/tab-stage-view/nodejs/teamsapp.local.yml
@@ -87,4 +87,5 @@ deploy:
       envs:
         MicrosoftAppId: ${{AAD_APP_CLIENT_ID}}
         MicrosoftAppPassword: ${{SECRET_AAD_APP_CLIENT_SECRET}}
-        BaseUrl: ${{BOT_ENDPOINT}}
\ No newline at end of file
+        BaseUrl: ${{BOT_ENDPOINT}}
+        TeamsAppId: ${{TEAMS_APP_ID}}
\ No newline at end of file