diff --git a/README.md b/README.md
index c32e6a9935..a227db3d68 100644
--- a/README.md
+++ b/README.md
@@ -219,7 +219,7 @@ The [Teams Toolkit](https://marketplace.visualstudio.com/items?itemName=TeamsDev
 
 |    | Sample Name    | Description                                                                      | C#    | JavaScript      |App Manifest|
 |:--:|:---------------|:---------------------------------------------------------------------------------|:------|:----------------|:-------|
-|1|Task Modules          | Sample app showing off the Teams Task Module, a way to invoke custom code from a bot, a tab, or both! |[View][bot-task-module#cs]     |[View][bot-task-module#js] ![toolkit-icon](assets/toolkit-icon.png) |[View](/samples/bot-task-module/csharp/demo-manifest/bot-task-module.zip)
+|1|Teams Dialogs (referred as task modules in TeamsJS v1.x)         | Sample app showing off the Teams Dialogs(referred as task modules in TeamsJS v1.x), a way to invoke custom code from a bot, a tab, or both! |[View][bot-task-module#cs]     |[View][bot-task-module#js] ![toolkit-icon](assets/toolkit-icon.png) |[View](/samples/bot-task-module/csharp/demo-manifest/bot-task-module.zip)
 |2|Authentication        | Sample illustrating seamless inline authentication for Microsoft Teams apps.                      | | [View][app-auth#ts]
 |3|Complete Samples      | Sample covering multiple scenarios - dialogs, ME, and facebook auth.                                      |[View][app-complete#cs]        |[View][app-complete#ts] ![toolkit-icon](assets/toolkit-icon.png) 
 |4|Region Selection App | This app contains a bot and Tab which is helpful to set the region |[View][region-selection-app#cs]     ||[View](/samples/app-region-selection/csharp/demo-manifest/app-region-selection.zip)
diff --git a/samples/bot-task-module/csharp/Bots/TeamsTaskModuleBot.cs b/samples/bot-task-module/csharp/Bots/TeamsTaskModuleBot.cs
index 502bec8a64..609fd3bba9 100644
--- a/samples/bot-task-module/csharp/Bots/TeamsTaskModuleBot.cs
+++ b/samples/bot-task-module/csharp/Bots/TeamsTaskModuleBot.cs
@@ -77,10 +77,10 @@ private static void SetTaskInfo(TaskModuleTaskInfo taskInfo, UISettings uIConsta
 
         private static Attachment GetTaskModuleHeroCardOptions()
         {
-            // Create a Hero Card with TaskModuleActions for each Task Module
+            // Create a Hero Card with TaskModuleActions for each Dialogs (referred as task modules in TeamsJS v1.x)
             return new HeroCard()
             {
-                Title = "Task Module Invocation from Hero Card",
+                Title = "Dialogs (referred as task modules in TeamsJS v1.x) Invocation from Hero Card",
                 Buttons = new[] { TaskModuleUIConstants.AdaptiveCard, TaskModuleUIConstants.CustomForm, TaskModuleUIConstants.YouTube }
                             .Select(cardType => new TaskModuleAction(cardType.ButtonTitle, new CardTaskFetchValue<string>() { Data = cardType.Id }))
                             .ToList<CardAction>(),
@@ -89,12 +89,12 @@ private static Attachment GetTaskModuleHeroCardOptions()
 
         private static Attachment GetTaskModuleAdaptiveCardOptions()
         {
-            // Create an Adaptive Card with an AdaptiveSubmitAction for each Task Module
+            // Create an Adaptive Card with an AdaptiveSubmitAction for each Dialogs (referred as task modules in TeamsJS v1.x)
             var card = new AdaptiveCard(new AdaptiveSchemaVersion(1, 2))
             {
                 Body = new List<AdaptiveElement>()
                     {
-                        new AdaptiveTextBlock(){ Text="Task Module Invocation from Adaptive Card", Weight=AdaptiveTextWeight.Bolder, Size=AdaptiveTextSize.Large}
+                        new AdaptiveTextBlock(){ Text="Dialogs (referred as task modules in TeamsJS v1.x) Invocation from Adaptive Card", Weight=AdaptiveTextWeight.Bolder, Size=AdaptiveTextSize.Large}
                     },
                 Actions = new[] { TaskModuleUIConstants.AdaptiveCard, TaskModuleUIConstants.CustomForm, TaskModuleUIConstants.YouTube }
                             .Select(cardType => new AdaptiveSubmitAction() { Title = cardType.ButtonTitle, Data = new AdaptiveCardTaskFetchValue<string>() { Data = cardType.Id } })
diff --git a/samples/bot-task-module/csharp/Images/1.InstallApp.png b/samples/bot-task-module/csharp/Images/1.InstallApp.png
new file mode 100644
index 0000000000..0b02d38aad
Binary files /dev/null and b/samples/bot-task-module/csharp/Images/1.InstallApp.png differ
diff --git a/samples/bot-task-module/csharp/Images/10.GroupChat.png b/samples/bot-task-module/csharp/Images/10.GroupChat.png
new file mode 100644
index 0000000000..0e1648cfcd
Binary files /dev/null and b/samples/bot-task-module/csharp/Images/10.GroupChat.png differ
diff --git a/samples/bot-task-module/csharp/Images/11.GroupDialogs.png b/samples/bot-task-module/csharp/Images/11.GroupDialogs.png
new file mode 100644
index 0000000000..302d23eae7
Binary files /dev/null and b/samples/bot-task-module/csharp/Images/11.GroupDialogs.png differ
diff --git a/samples/bot-task-module/csharp/Images/12.GroupCustomForm.png b/samples/bot-task-module/csharp/Images/12.GroupCustomForm.png
new file mode 100644
index 0000000000..fe9203bc93
Binary files /dev/null and b/samples/bot-task-module/csharp/Images/12.GroupCustomForm.png differ
diff --git a/samples/bot-task-module/csharp/Images/13.GroupResults.png b/samples/bot-task-module/csharp/Images/13.GroupResults.png
new file mode 100644
index 0000000000..ba87e48b14
Binary files /dev/null and b/samples/bot-task-module/csharp/Images/13.GroupResults.png differ
diff --git a/samples/bot-task-module/csharp/Images/2.Dialogs.png b/samples/bot-task-module/csharp/Images/2.Dialogs.png
new file mode 100644
index 0000000000..22b260fb10
Binary files /dev/null and b/samples/bot-task-module/csharp/Images/2.Dialogs.png differ
diff --git a/samples/bot-task-module/csharp/Images/3.AdaptiveCard.png b/samples/bot-task-module/csharp/Images/3.AdaptiveCard.png
new file mode 100644
index 0000000000..5d1c7647cd
Binary files /dev/null and b/samples/bot-task-module/csharp/Images/3.AdaptiveCard.png differ
diff --git a/samples/bot-task-module/csharp/Images/4.ThanksAdaptiveCard.png b/samples/bot-task-module/csharp/Images/4.ThanksAdaptiveCard.png
new file mode 100644
index 0000000000..eb429821f1
Binary files /dev/null and b/samples/bot-task-module/csharp/Images/4.ThanksAdaptiveCard.png differ
diff --git a/samples/bot-task-module/csharp/Images/5.CustomForm.png b/samples/bot-task-module/csharp/Images/5.CustomForm.png
new file mode 100644
index 0000000000..924e6276e8
Binary files /dev/null and b/samples/bot-task-module/csharp/Images/5.CustomForm.png differ
diff --git a/samples/bot-task-module/csharp/Images/6.Results.png b/samples/bot-task-module/csharp/Images/6.Results.png
new file mode 100644
index 0000000000..ca40f6fdea
Binary files /dev/null and b/samples/bot-task-module/csharp/Images/6.Results.png differ
diff --git a/samples/bot-task-module/csharp/Images/7.YouTube.png b/samples/bot-task-module/csharp/Images/7.YouTube.png
new file mode 100644
index 0000000000..18b9527f62
Binary files /dev/null and b/samples/bot-task-module/csharp/Images/7.YouTube.png differ
diff --git a/samples/bot-task-module/csharp/Images/8.Task.png b/samples/bot-task-module/csharp/Images/8.Task.png
new file mode 100644
index 0000000000..67eab5223d
Binary files /dev/null and b/samples/bot-task-module/csharp/Images/8.Task.png differ
diff --git a/samples/bot-task-module/csharp/Images/9.PowerApp.png b/samples/bot-task-module/csharp/Images/9.PowerApp.png
new file mode 100644
index 0000000000..b9eaac4bb6
Binary files /dev/null and b/samples/bot-task-module/csharp/Images/9.PowerApp.png differ
diff --git a/samples/bot-task-module/csharp/Images/Bot_Tab_TaskModule.gif b/samples/bot-task-module/csharp/Images/Bot_Tab_TaskModule.gif
index d59e989ff4..62a3e52f57 100644
Binary files a/samples/bot-task-module/csharp/Images/Bot_Tab_TaskModule.gif and b/samples/bot-task-module/csharp/Images/Bot_Tab_TaskModule.gif differ
diff --git a/samples/bot-task-module/csharp/Images/Customform.png b/samples/bot-task-module/csharp/Images/Customform.png
deleted file mode 100644
index e26e4750e1..0000000000
Binary files a/samples/bot-task-module/csharp/Images/Customform.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/Tab_AdaptiveCard.png b/samples/bot-task-module/csharp/Images/Tab_AdaptiveCard.png
deleted file mode 100644
index 61dde6babb..0000000000
Binary files a/samples/bot-task-module/csharp/Images/Tab_AdaptiveCard.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/customformregister.png b/samples/bot-task-module/csharp/Images/customformregister.png
deleted file mode 100644
index 2ec4507f7c..0000000000
Binary files a/samples/bot-task-module/csharp/Images/customformregister.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/gc-AddApp-chat.png b/samples/bot-task-module/csharp/Images/gc-AddApp-chat.png
deleted file mode 100644
index a5b4cc4b34..0000000000
Binary files a/samples/bot-task-module/csharp/Images/gc-AddApp-chat.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/gc-AddApp.png b/samples/bot-task-module/csharp/Images/gc-AddApp.png
deleted file mode 100644
index cb7b5d860f..0000000000
Binary files a/samples/bot-task-module/csharp/Images/gc-AddApp.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/gc-Interaction.png b/samples/bot-task-module/csharp/Images/gc-Interaction.png
deleted file mode 100644
index 2b07897406..0000000000
Binary files a/samples/bot-task-module/csharp/Images/gc-Interaction.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/ps-AC-ButtonClick.png b/samples/bot-task-module/csharp/Images/ps-AC-ButtonClick.png
deleted file mode 100644
index 6dddaba927..0000000000
Binary files a/samples/bot-task-module/csharp/Images/ps-AC-ButtonClick.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/ps-AC-TaskModule-Submit.png b/samples/bot-task-module/csharp/Images/ps-AC-TaskModule-Submit.png
deleted file mode 100644
index 90f5989dff..0000000000
Binary files a/samples/bot-task-module/csharp/Images/ps-AC-TaskModule-Submit.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/ps-AC-TaskModule.png b/samples/bot-task-module/csharp/Images/ps-AC-TaskModule.png
deleted file mode 100644
index 2174cac84d..0000000000
Binary files a/samples/bot-task-module/csharp/Images/ps-AC-TaskModule.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/ps-AddApp.png b/samples/bot-task-module/csharp/Images/ps-AddApp.png
deleted file mode 100644
index b1492f52c6..0000000000
Binary files a/samples/bot-task-module/csharp/Images/ps-AddApp.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/ps-Cards.png b/samples/bot-task-module/csharp/Images/ps-Cards.png
deleted file mode 100644
index 8b60aa0458..0000000000
Binary files a/samples/bot-task-module/csharp/Images/ps-Cards.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/ps-CustomForm-ButtonClick.png b/samples/bot-task-module/csharp/Images/ps-CustomForm-ButtonClick.png
deleted file mode 100644
index 57dd2cef99..0000000000
Binary files a/samples/bot-task-module/csharp/Images/ps-CustomForm-ButtonClick.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/ps-CustomForm-Fill.png b/samples/bot-task-module/csharp/Images/ps-CustomForm-Fill.png
deleted file mode 100644
index 3a612883c9..0000000000
Binary files a/samples/bot-task-module/csharp/Images/ps-CustomForm-Fill.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/ps-CustomForm-Submit.png b/samples/bot-task-module/csharp/Images/ps-CustomForm-Submit.png
deleted file mode 100644
index ae913f2f1a..0000000000
Binary files a/samples/bot-task-module/csharp/Images/ps-CustomForm-Submit.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/ps-Youtube-Button.png b/samples/bot-task-module/csharp/Images/ps-Youtube-Button.png
deleted file mode 100644
index 54a754c17a..0000000000
Binary files a/samples/bot-task-module/csharp/Images/ps-Youtube-Button.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/ps-Youtube-TaskModule.png b/samples/bot-task-module/csharp/Images/ps-Youtube-TaskModule.png
deleted file mode 100644
index efd5c01b43..0000000000
Binary files a/samples/bot-task-module/csharp/Images/ps-Youtube-TaskModule.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/tasks.png b/samples/bot-task-module/csharp/Images/tasks.png
deleted file mode 100644
index 1d8fb5e69a..0000000000
Binary files a/samples/bot-task-module/csharp/Images/tasks.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/ts-AddApp.png b/samples/bot-task-module/csharp/Images/ts-AddApp.png
deleted file mode 100644
index 08686333ef..0000000000
Binary files a/samples/bot-task-module/csharp/Images/ts-AddApp.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/ts-AddToChannel.png b/samples/bot-task-module/csharp/Images/ts-AddToChannel.png
deleted file mode 100644
index aac8d660a7..0000000000
Binary files a/samples/bot-task-module/csharp/Images/ts-AddToChannel.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/ts-Interaction.png b/samples/bot-task-module/csharp/Images/ts-Interaction.png
deleted file mode 100644
index 4af24b464f..0000000000
Binary files a/samples/bot-task-module/csharp/Images/ts-Interaction.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Images/youtube.png b/samples/bot-task-module/csharp/Images/youtube.png
deleted file mode 100644
index da537e6dc3..0000000000
Binary files a/samples/bot-task-module/csharp/Images/youtube.png and /dev/null differ
diff --git a/samples/bot-task-module/csharp/Pages/Configure.cshtml b/samples/bot-task-module/csharp/Pages/Configure.cshtml
index 0b80916c47..4d41f969f0 100644
--- a/samples/bot-task-module/csharp/Pages/Configure.cshtml
+++ b/samples/bot-task-module/csharp/Pages/Configure.cshtml
@@ -12,7 +12,7 @@
     <p>
         <label for="tabChoice">Select the tab you would like to see: </label>
         <div>
-            <input type="radio" name="tabType" value="tasks" onclick="onClick()">Task Module<br>
+            <input type="radio" name="tabType" value="tasks" onclick="onClick()">Teams Dialogs<br>
             <input type="radio" name="tabType" value="helloworld" onclick="onClick()"> Hello World
         </div>
     </p>
@@ -27,7 +27,7 @@
             microsoftTeams.settings.setSettings({
                 entityId: "tasks",
                 contentUrl: @Json.Serialize(Configuration["BaseUrl"])+"/tasks",
-                suggestedDisplayName: "Task Module CSharp",
+                suggestedDisplayName: "Teams Dialogs CSharp",
                 websiteUrl: @Json.Serialize(Configuration["BaseUrl"])+"/tasks"
             });
         } else {
@@ -46,4 +46,4 @@
         microsoftTeams.settings.setValidityState(true);
     }
 
-</script>
+</script>
\ No newline at end of file
diff --git a/samples/bot-task-module/csharp/Pages/CustomForm.cshtml b/samples/bot-task-module/csharp/Pages/CustomForm.cshtml
index e312f3e2d0..be74e6840b 100644
--- a/samples/bot-task-module/csharp/Pages/CustomForm.cshtml
+++ b/samples/bot-task-module/csharp/Pages/CustomForm.cshtml
@@ -14,18 +14,18 @@
             padding-right: 4px;
         }
     </style>
-    <title>Microsoft Teams Task Module Tester - Custom Form</title>
+    <title>Microsoft Teams Dialogs (referred as task modules in TeamsJS v1.x) Tester - Custom Form</title>
 </head>
 <body>
     <script>
-        microsoftTeams.initialize();
+        microsoftTeams.initialize(); 
         function validateForm() {
             var customerInfo = {
                 name: document.forms["customerForm"]["name"].value,
                 email: document.forms["customerForm"]["email"].value,
                 favoriteBook: document.forms["customerForm"]["favoriteBook"].value
             }
-            microsoftTeams.tasks.submitTask(customerInfo, "@Model.MicrosoftAppId");
+            microsoftTeams.dialog.submit(customerInfo, "@Model.MicrosoftAppId");
             return true;
         }
     </script>
diff --git a/samples/bot-task-module/csharp/Pages/HelloWorld.cshtml b/samples/bot-task-module/csharp/Pages/HelloWorld.cshtml
index 4f27297447..480c20d400 100644
--- a/samples/bot-task-module/csharp/Pages/HelloWorld.cshtml
+++ b/samples/bot-task-module/csharp/Pages/HelloWorld.cshtml
@@ -4,5 +4,5 @@
     Layout = "~/Pages/Shared/_Layout.cshtml";
 }
 <p>
-    Welcome to Microsoft Teams Task Module Sample App (C#)
-</p>
+    Welcome to Microsoft Teams Dialogs (referred as task modules in TeamsJS v1.x) Sample App (C#)
+</p>
\ No newline at end of file
diff --git a/samples/bot-task-module/csharp/Pages/PowerApp.cshtml b/samples/bot-task-module/csharp/Pages/PowerApp.cshtml
index 726a9310a9..ce7e6b043b 100644
--- a/samples/bot-task-module/csharp/Pages/PowerApp.cshtml
+++ b/samples/bot-task-module/csharp/Pages/PowerApp.cshtml
@@ -9,7 +9,7 @@
 <iframe width="720" height="520" style="width: 94%;" src="https://web.powerapps.com/webplayer/iframeapp?source=iframe&amp;screenColor=rgba(104,101,171,1)&amp;appId=/providers/Microsoft.PowerApps/apps/f998c01d-522c-46ad-9690-f67f271afdfe"></iframe>
 <div class="surface" id="powerAppError" style="display: none; padding: 20px;">
     <p>
-        This task module shows an "Asset Checkout" PowerApp (you'll find more information on it <a href="https://powerusers.microsoft.com/t5/Community-Apps-Gallery/Asset-Checkout-Microsoft-sample/td-p/43221" target="_blank">here</a>). Unfortunately, PowerApps
+        This dialogs (referred as task modules in TeamsJS v1.x)  shows an "Asset Checkout" PowerApp (you'll find more information on it <a href="https://powerusers.microsoft.com/t5/Community-Apps-Gallery/Asset-Checkout-Microsoft-sample/td-p/43221" target="_blank">here</a>). Unfortunately, PowerApps
         are tenant-specific. The one in this sample only works on the Microsoft.com tenant.
     </p>
     <p>To create your own:</p>
@@ -37,4 +37,3 @@
         }
     });
 </script>
-
diff --git a/samples/bot-task-module/csharp/Pages/Shared/_EmbedPage.cshtml b/samples/bot-task-module/csharp/Pages/Shared/_EmbedPage.cshtml
index f06d3d0e46..bbd73e571d 100644
--- a/samples/bot-task-module/csharp/Pages/Shared/_EmbedPage.cshtml
+++ b/samples/bot-task-module/csharp/Pages/Shared/_EmbedPage.cshtml
@@ -3,7 +3,7 @@
 <head>
     <meta name="viewport" content="width=device-width" />
     <title>@ViewBag.Title</title>
-    <script src="https://statics.teams.cdn.office.net/sdk/v1.5.2/js/MicrosoftTeams.min.js" asp-append-version="true"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
 
     @RenderSection("scripts", required: false)
 </head>
@@ -32,7 +32,7 @@
         //- Handle the Esc key
         document.onkeyup = function (event) {
             if ((event.key === 27) || (event.key === "Escape")) {
-                microsoftTeams.tasks.submitTask(null); //- this will return an err object to the completionHandler()
+                microsoftTeams.dialog.submit(null); //- this will return an err object to the completionHandler()
             }
         }</script>
     <div id="embed-container">@RenderBody()</div>
diff --git a/samples/bot-task-module/csharp/Pages/Shared/_Layout.cshtml b/samples/bot-task-module/csharp/Pages/Shared/_Layout.cshtml
index 258cd100cc..c937248bfe 100644
--- a/samples/bot-task-module/csharp/Pages/Shared/_Layout.cshtml
+++ b/samples/bot-task-module/csharp/Pages/Shared/_Layout.cshtml
@@ -6,7 +6,8 @@
     <link rel="stylesheet" href="~/css/Custom.css" />
     <link rel="stylesheet" href="~/css/Site.css" />
 
-    <script src="https://statics.teams.cdn.office.net/sdk/v1.5.2/js/MicrosoftTeams.min.js" asp-append-version="true"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
+    </script>
 
     @RenderSection("scripts", required: false)
 </head>
diff --git a/samples/bot-task-module/csharp/Pages/Tasks.cshtml b/samples/bot-task-module/csharp/Pages/Tasks.cshtml
index 1db05475fb..c58846de48 100644
--- a/samples/bot-task-module/csharp/Pages/Tasks.cshtml
+++ b/samples/bot-task-module/csharp/Pages/Tasks.cshtml
@@ -13,9 +13,9 @@
     DeeplinkHelper deepLinkHelper = new DeeplinkHelper(@Json.Serialize(Configuration["MicrosoftAppId"]).ToString(), @Json.Serialize(Configuration["BaseUrl"]).ToString());
 }
 
-<div class="font-semibold font-title">Microsoft Teams Task Modules Demo</div>
+<div class="font-semibold font-title">Microsoft Teams Dialogs (referred as task modules in TeamsJS v1.x) Demo</div>
 <p>
-    A task module allows Teams app developers to create one or more custom, modal experiences with custom code for their users, particularly useful for initiating and/or completing tasks using a GUI that does not litter a Teams conversation with superfluous,
+    A dialog (referred as task modules in TeamsJS v1.x) allows Teams app developers to create one or more custom, modal experiences with custom code for their users, particularly useful for initiating and/or completing tasks using a GUI that does not litter a Teams conversation with superfluous,
     intermediate task completion information.
 </p>
 <p>
@@ -39,50 +39,56 @@
 <p></p>
 <script src="~/Scripts/teamsapp.js"></script>
 <script>
-    microsoftTeams.initialize();
+    microsoftTeams.app.initialize();
 
-    submitHandler = (err, result) => {
+    submitHandler = (err) => {
             console.log(`Submit handler - err: ${err}`);
         };
 
         function Submit(type) {
             let taskInfo = {
                 title: null,
-                height: null,
-                width: null,
+                size: null,
                 url: null,
                 card: null,
                 fallbackUrl: null,
                 completionBotId: null,
             };
 
-            taskInfo.title = "Task Module Demo";
-            taskInfo.height = "medium";
-            taskInfo.width = "medium";
+            let taskModuleSize = {
+                height: 400,
+                width: 400,
+            };
+
+        taskInfo.title = "Teams Dialogs Demo";
 
             if (type.includes('youtube')) {
             taskInfo.url = @Json.Serialize(Configuration["BaseUrl"]) + "/youtube";
                 taskInfo.title = "@(TaskModuleUIConstants.YouTube.Title)";
-                taskInfo.height = "@(TaskModuleUIConstants.YouTube.Height)";
-                taskInfo.width = "@(TaskModuleUIConstants.YouTube.Width)";
+                taskModuleSize.height = "@(TaskModuleUIConstants.YouTube.Height)";
+                taskModuleSize.width = "@(TaskModuleUIConstants.YouTube.Width)";
+                taskInfo.size = taskModuleSize;
             }
             else if (type.includes('powerapp')) {
             taskInfo.url = @Json.Serialize(Configuration["BaseUrl"]) + "/powerapp";
                 taskInfo.title = "@(TaskModuleUIConstants.PowerApp.Title)";
-                taskInfo.height = "@(TaskModuleUIConstants.PowerApp.Height)";
-                taskInfo.width = "@(TaskModuleUIConstants.PowerApp.Width)";
+                taskModuleSize.height = "@(TaskModuleUIConstants.PowerApp.Height)";
+                taskModuleSize.width = "@(TaskModuleUIConstants.PowerApp.Width)";
+                taskInfo.size = taskModuleSize;
             }
             else if (type.includes('customform')) {
             taskInfo.url = @Json.Serialize(Configuration["BaseUrl"]) + "/customform";
                 taskInfo.title = "@(TaskModuleUIConstants.CustomForm.Title)";
-                taskInfo.height = "@(TaskModuleUIConstants.CustomForm.Height)";
-                taskInfo.width = "@(TaskModuleUIConstants.CustomForm.Width)";
+                taskModuleSize.height = "@(TaskModuleUIConstants.CustomForm.Height)";
+                taskModuleSize.width = "@(TaskModuleUIConstants.CustomForm.Width)";
+                taskInfo.size = taskModuleSize;
             }
             else {
                 taskInfo.card =  @Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(AdaptiveCardHelper.GetAdaptiveCard()));
                 taskInfo.title = "@(TaskModuleUIConstants.AdaptiveCard.Title)";
-                taskInfo.height = "@(TaskModuleUIConstants.AdaptiveCard.Height)";
-                taskInfo.width = "@(TaskModuleUIConstants.AdaptiveCard.Width)";
+                taskModuleSize.height = "@(TaskModuleUIConstants.AdaptiveCard.Height)";
+                taskModuleSize.width = "@(TaskModuleUIConstants.AdaptiveCard.Width)";
+                taskInfo.size = taskModuleSize;
             }
 
             // Set fallback URL
@@ -91,6 +97,6 @@
             if (type.includes('bot'))
             taskInfo.completionBotId = @Json.Serialize(Configuration["MicrosoftAppId"]);
 
-            microsoftTeams.tasks.startTask(taskInfo, submitHandler);
+            microsoftTeams.dialog.open(taskInfo, submitHandler);
         }
 </script>
diff --git a/samples/bot-task-module/csharp/README.md b/samples/bot-task-module/csharp/README.md
index 29b752d51f..2952a3b1bc 100644
--- a/samples/bot-task-module/csharp/README.md
+++ b/samples/bot-task-module/csharp/README.md
@@ -1,6 +1,6 @@
 ---
 page_type: sample
-description: This sample app demonstrate how to use Task Module using Bot Framework v4
+description: This sample app demonstrate how to use Dialogs (referred as task modules in TeamsJS v1.x) using Bot Framework v4
 products:
 - office-teams
 - office
@@ -13,16 +13,16 @@ extensions:
 urlFragment: officedev-microsoft-teams-samples-bot-task-module-csharp
 
 ---
-# Teams Task Module
+# Teams Dialog (referred as task modules in TeamsJS v1.x)
 
-Bot Framework Teams Task Module sample.
+Bot Framework Teams Dialogs (referred as task modules in TeamsJS v1.x) sample.
 
-This bot has been created using [Bot Framework](https://dev.botframework.com). It shows how to fetch a Task Module from Hero Card or Adaptive Card buttons and receive input from the Task Module in the bot.
+This bot has been created using [Bot Framework](https://dev.botframework.com). It shows how to fetch a Dialog (referred as task modules in TeamsJS v1.x) from Hero Card or Adaptive Card buttons and receive input from the Dialog (referred as task modules in TeamsJS v1.x) in the bot.
 
 ## Included Features
 * Bots
 * Tabs
-* Task Modules
+* Dialogs (referred as task modules in TeamsJS v1.x)
 
 ## Interaction with bot
 ![bot-task-module ](Images/Bot_Tab_TaskModule.gif)
@@ -30,7 +30,7 @@ This bot has been created using [Bot Framework](https://dev.botframework.com). I
 ## Try it yourself - experience the App in your Microsoft Teams client
 Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app manifest (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)).
 
-**Teams Task Module:** [Manifest](/samples/bot-task-module/csharp/demo-manifest/bot-task-module.zip)
+**Teams Dialogs (referred as task modules in TeamsJS v1.x):** [Manifest](/samples/bot-task-module/csharp/demo-manifest/bot-task-module.zip)
 
 ## Prerequisites
 
@@ -124,35 +124,35 @@ the Teams service needs to call into the bot.
 
 > Note this `manifest.json` specified that the bot will be installed in "personal", "team" and "groupchat" scope which is why you immediately entered a one on one chat conversation with the bot. You can at mention the bot in a group chat or in a Channel in the Team you installed it in. Please refer to Teams documentation for more details.
 
-You can interact with this bot by sending it a message. The bot will respond with a Hero Card and Adaptive Card with buttons which will display a Task Module when clicked. The Task Modules demonstrate retrieving input from a user, or displaying custom web page content.
+You can interact with this bot by sending it a message. The bot will respond with a Hero Card and Adaptive Card with buttons which will display a Dialog (referred as task modules in TeamsJS v1.x) when clicked. The Dialogs (referred as task modules in TeamsJS v1.x) demonstrate retrieving input from a user, or displaying custom web page content.
 
 - **Personal Scope Interactions:**
 
-![ps-AddApp ](Images/ps-AddApp.png)
+![1.InstallApp ](Images/1.InstallApp.png)
 
-![ps-Cards ](Images/ps-Cards.png)
+![2.Dialogs ](Images/2.Dialogs.png)
 
-![ps-AC-TaskModule ](Images/ps-AC-TaskModule.png)
+![2.GroupDialogs ](Images/2.GroupDialogs.png)
 
-![ps-AC-TaskModule-Submit ](Images/ps-AC-TaskModule-Submit.png)
+![3.AdaptiveCard ](Images/3.AdaptiveCard.png)
 
-- **Group Chat Scope Interactions:**
+![4.ThanksAdaptiveCard ](Images/4.ThanksAdaptiveCard.png)
 
-![gc-Interaction ](Images/gc-Interaction.png)
+![5.CustomForm ](Images/5.CustomForm.png)
 
-- **Team Scope Interactions:**
+![6.Results ](Images/6.Results.png)
 
-![ts-Interaction ](Images/ts-Interaction.png)
+![7.YouTube ](Images/7.YouTube.png)
 
-![tasks](Images/tasks.png)
+![8.Task ](Images/8.Task.png)
 
-![youtube](Images/youtube.png)
+![9.PowerApp ](Images/9.PowerApp.png)
 
-![Customform](Images/Customform.png)
+![10.GroupChat ](Images/10.GroupChat.png)
 
-![customformregister](Images/customformregister.png)
+![11.GroupCustomForm ](Images/12.GroupCustomForm.png)
 
-![TabAdaptiveCard](Images/Tab_AdaptiveCard.png)
+![12.GroupResults ](Images/13.GroupResults.png)
 
 ## Deploy the bot to Azure
 
@@ -164,6 +164,6 @@ To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](htt
 - [Bot Basics](https://docs.microsoft.com/azure/bot-service/bot-builder-basics?view=azure-bot-service-4.0)
 - [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0)
 - [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0)
-- [Task modules](https://learn.microsoft.com/en-us/microsoftteams/platform/task-modules-and-cards/what-are-task-modules)
+- [Dialogs](https://learn.microsoft.com/en-us/microsoftteams/platform/task-modules-and-cards/what-are-task-modules)
 
 <img src="https://pnptelemetry.azurewebsites.net/microsoft-teams-samples/samples/bot-task-module-csharp" />
\ No newline at end of file
diff --git a/samples/bot-task-module/csharp/TeamsApp/appPackage/manifest.json b/samples/bot-task-module/csharp/TeamsApp/appPackage/manifest.json
index b628e15364..84114ee65f 100644
--- a/samples/bot-task-module/csharp/TeamsApp/appPackage/manifest.json
+++ b/samples/bot-task-module/csharp/TeamsApp/appPackage/manifest.json
@@ -15,12 +15,12 @@
     "outline": "outline.png"
   },
   "name": {
-    "short": "Task Module",
-    "full": "Simple Task Module"
+    "short": "Teams Dialogs",
+    "full": "Teams Dialog (referred as task modules in TeamsJS v1.x)"
   },
   "description": {
-    "short": "Test Task Module Scenario",
-    "full": "Simple Task Module Scenario Test"
+    "short": "Teams Dialog (referred as task modules in TeamsJS v1.x)",
+    "full": "This is an sample application which showcases how to invoke dialog (referred as task modules in TeamsJS v1.x) from adaptive and hero cards."
   },
   "accentColor": "#FFFFFF",
   "configurableTabs": [
diff --git a/samples/bot-task-module/csharp/assets/sample.json b/samples/bot-task-module/csharp/assets/sample.json
index cb61060ab4..18fbc37a82 100644
--- a/samples/bot-task-module/csharp/assets/sample.json
+++ b/samples/bot-task-module/csharp/assets/sample.json
@@ -2,11 +2,11 @@
   {
     "name": "officedev-microsoft-teams-samples-bot-task-module-csharp",
     "source": "officeDev",
-    "title": "Task Module using Bot Framework v4",
-    "shortDescription": "This sample app demonstrate how to use Task Module using Bot Framework v4",
+    "title": "Dialogs (referred as task modules in TeamsJS v1.x) using Bot Framework v4",
+    "shortDescription": "This sample app demonstrate how to use Dialog (referred as task modules in TeamsJS v1.x) using Bot Framework v4",
     "url": "https://github.com/OfficeDev/Microsoft-Teams-Samples/tree/main/samples/bot-task-module/csharp",
     "longDescription": [
-      "This sample app demonstrate how to use Task Module using Bot Framework v4"
+      "This sample app demonstrate how to use Dialog (referred as task modules in TeamsJS v1.x) using Bot Framework v4"
     ],
     "creationDateTime": "2019-10-17",
     "updateDateTime": "2022-12-06",
@@ -36,7 +36,7 @@
         "type": "image",
         "order": 100,
         "url": "https://raw.githubusercontent.com/OfficeDev/Microsoft-Teams-Samples/main/samples/bot-task-module/csharp/Images/Bot_Tab_TaskModule.gif",
-        "alt": "Solution UX showing Task Module using Bot Framework v4"
+        "alt": "Solution UX showing Dialog (referred as task modules in TeamsJS v1.x) using Bot Framework v4"
       }
     ],
     "authors": [
diff --git a/samples/bot-task-module/csharp/wwwroot/default.htm b/samples/bot-task-module/csharp/wwwroot/default.htm
index ef7c051c95..6c4f50599e 100644
--- a/samples/bot-task-module/csharp/wwwroot/default.htm
+++ b/samples/bot-task-module/csharp/wwwroot/default.htm
@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Teams Task Module Messaging Extension</title>
+    <title>Teams Dialogs (referred as task modules in TeamsJS v1.x)</title>
     <style>
         body {
             margin: 0px;
@@ -265,7 +265,7 @@
     <header class="header">
         <div class="header-inner-container">
             <div class="header-icon" style="display: inline-block"></div>
-            <div class="header-text" style="display: inline-block">Task Module Messaging Extension</div>
+            <div class="header-text" style="display: inline-block">Teams Dialogs (referred as task modules in TeamsJS v1.x)</div>
         </div>
     </header>
     <div class="row">
diff --git a/samples/bot-task-module/nodejs/Images/1.Install.png b/samples/bot-task-module/nodejs/Images/1.Install.png
index 6a768f8ab8..171df53395 100644
Binary files a/samples/bot-task-module/nodejs/Images/1.Install.png and b/samples/bot-task-module/nodejs/Images/1.Install.png differ
diff --git a/samples/bot-task-module/nodejs/Images/10.Powerapp_in_Tab.png b/samples/bot-task-module/nodejs/Images/10.Powerapp_in_Tab.png
index b5b26dbc31..68d223ba4c 100644
Binary files a/samples/bot-task-module/nodejs/Images/10.Powerapp_in_Tab.png and b/samples/bot-task-module/nodejs/Images/10.Powerapp_in_Tab.png differ
diff --git a/samples/bot-task-module/nodejs/Images/11.Custom_form_in_Tab.png b/samples/bot-task-module/nodejs/Images/11.Custom_form_in_Tab.png
index 5e05119b93..6bd7190d54 100644
Binary files a/samples/bot-task-module/nodejs/Images/11.Custom_form_in_Tab.png and b/samples/bot-task-module/nodejs/Images/11.Custom_form_in_Tab.png differ
diff --git a/samples/bot-task-module/nodejs/Images/12.Adaptive_Card_in_Tab.png b/samples/bot-task-module/nodejs/Images/12.Adaptive_Card_in_Tab.png
deleted file mode 100644
index b203df68c7..0000000000
Binary files a/samples/bot-task-module/nodejs/Images/12.Adaptive_Card_in_Tab.png and /dev/null differ
diff --git a/samples/bot-task-module/nodejs/Images/12.GroupChat.png b/samples/bot-task-module/nodejs/Images/12.GroupChat.png
new file mode 100644
index 0000000000..e4d0ace0c7
Binary files /dev/null and b/samples/bot-task-module/nodejs/Images/12.GroupChat.png differ
diff --git a/samples/bot-task-module/nodejs/Images/13.ConfigTab.png b/samples/bot-task-module/nodejs/Images/13.ConfigTab.png
new file mode 100644
index 0000000000..6387da2d8c
Binary files /dev/null and b/samples/bot-task-module/nodejs/Images/13.ConfigTab.png differ
diff --git a/samples/bot-task-module/nodejs/Images/14.ConfigTabResults.png b/samples/bot-task-module/nodejs/Images/14.ConfigTabResults.png
new file mode 100644
index 0000000000..813c479ca3
Binary files /dev/null and b/samples/bot-task-module/nodejs/Images/14.ConfigTabResults.png differ
diff --git a/samples/bot-task-module/nodejs/Images/15.GroupChatCard.png b/samples/bot-task-module/nodejs/Images/15.GroupChatCard.png
new file mode 100644
index 0000000000..a0666d89a6
Binary files /dev/null and b/samples/bot-task-module/nodejs/Images/15.GroupChatCard.png differ
diff --git a/samples/bot-task-module/nodejs/Images/15.GroupChatCardResults.png b/samples/bot-task-module/nodejs/Images/15.GroupChatCardResults.png
new file mode 100644
index 0000000000..c3f8b5f14b
Binary files /dev/null and b/samples/bot-task-module/nodejs/Images/15.GroupChatCardResults.png differ
diff --git a/samples/bot-task-module/nodejs/Images/2.Interaction_with_Bot.png b/samples/bot-task-module/nodejs/Images/2.Interaction_with_Bot.png
index a9d696849c..6c64f5f06e 100644
Binary files a/samples/bot-task-module/nodejs/Images/2.Interaction_with_Bot.png and b/samples/bot-task-module/nodejs/Images/2.Interaction_with_Bot.png differ
diff --git a/samples/bot-task-module/nodejs/Images/3.Adaptive_card_in_chat.png b/samples/bot-task-module/nodejs/Images/3.Adaptive_card_in_chat.png
index eb99099f49..df089e11e7 100644
Binary files a/samples/bot-task-module/nodejs/Images/3.Adaptive_card_in_chat.png and b/samples/bot-task-module/nodejs/Images/3.Adaptive_card_in_chat.png differ
diff --git a/samples/bot-task-module/nodejs/Images/4.Adaptive_card_submitted.png b/samples/bot-task-module/nodejs/Images/4.Adaptive_card_submitted.png
index c624d2d70f..be903a5beb 100644
Binary files a/samples/bot-task-module/nodejs/Images/4.Adaptive_card_submitted.png and b/samples/bot-task-module/nodejs/Images/4.Adaptive_card_submitted.png differ
diff --git a/samples/bot-task-module/nodejs/Images/5.Update_in_chat.png b/samples/bot-task-module/nodejs/Images/5.Update_in_chat.png
index 603f51367d..8658885432 100644
Binary files a/samples/bot-task-module/nodejs/Images/5.Update_in_chat.png and b/samples/bot-task-module/nodejs/Images/5.Update_in_chat.png differ
diff --git a/samples/bot-task-module/nodejs/Images/6.CustomForm.png b/samples/bot-task-module/nodejs/Images/6.CustomForm.png
new file mode 100644
index 0000000000..d1df6230d0
Binary files /dev/null and b/samples/bot-task-module/nodejs/Images/6.CustomForm.png differ
diff --git a/samples/bot-task-module/nodejs/Images/6.Interaction_with_bot_in_GC.png b/samples/bot-task-module/nodejs/Images/6.Interaction_with_bot_in_GC.png
deleted file mode 100644
index 1984dd28eb..0000000000
Binary files a/samples/bot-task-module/nodejs/Images/6.Interaction_with_bot_in_GC.png and /dev/null differ
diff --git a/samples/bot-task-module/nodejs/Images/7.CustomFormResults.png b/samples/bot-task-module/nodejs/Images/7.CustomFormResults.png
new file mode 100644
index 0000000000..9724784386
Binary files /dev/null and b/samples/bot-task-module/nodejs/Images/7.CustomFormResults.png differ
diff --git a/samples/bot-task-module/nodejs/Images/7.Interaction_in_team.png b/samples/bot-task-module/nodejs/Images/7.Interaction_in_team.png
deleted file mode 100644
index 8c09ed12d1..0000000000
Binary files a/samples/bot-task-module/nodejs/Images/7.Interaction_in_team.png and /dev/null differ
diff --git a/samples/bot-task-module/nodejs/Images/8.Tasks_Tab_in_chat.png b/samples/bot-task-module/nodejs/Images/8.Tasks_Tab_in_chat.png
index af12d31245..201cb20ebf 100644
Binary files a/samples/bot-task-module/nodejs/Images/8.Tasks_Tab_in_chat.png and b/samples/bot-task-module/nodejs/Images/8.Tasks_Tab_in_chat.png differ
diff --git a/samples/bot-task-module/nodejs/Images/9.Youtuube_in_chat.png b/samples/bot-task-module/nodejs/Images/9.Youtuube_in_chat.png
index e61c91637a..751ccf5c37 100644
Binary files a/samples/bot-task-module/nodejs/Images/9.Youtuube_in_chat.png and b/samples/bot-task-module/nodejs/Images/9.Youtuube_in_chat.png differ
diff --git a/samples/bot-task-module/nodejs/Images/TaskModule.gif b/samples/bot-task-module/nodejs/Images/TaskModule.gif
deleted file mode 100644
index 24d4325fa9..0000000000
Binary files a/samples/bot-task-module/nodejs/Images/TaskModule.gif and /dev/null differ
diff --git a/samples/bot-task-module/nodejs/Images/TeamsDialog.gif b/samples/bot-task-module/nodejs/Images/TeamsDialog.gif
new file mode 100644
index 0000000000..6788c966aa
Binary files /dev/null and b/samples/bot-task-module/nodejs/Images/TeamsDialog.gif differ
diff --git a/samples/bot-task-module/nodejs/README.md b/samples/bot-task-module/nodejs/README.md
index 96eeaf0efc..24f81f8cf3 100644
--- a/samples/bot-task-module/nodejs/README.md
+++ b/samples/bot-task-module/nodejs/README.md
@@ -1,6 +1,6 @@
 ---
 page_type: sample
-description: This is an sample application which showcases how to invoke task module from adaptive and hero cards.
+description: This is an sample application which showcases how to invoke Dialogs (referred as task modules in TeamsJS v1.x) from adaptive and hero cards.
 products:
 - office-teams
 - office
@@ -13,24 +13,24 @@ extensions:
 urlFragment: officedev-microsoft-teams-samples-bot-task-module-nodejs
 ---
 
-# Teams Task Module
+# Teams Dialog (referred as task modules in TeamsJS v1.x)
 
-Bot Framework Teams Task Module sample.
+Bot Framework Teams Dialog (referred as task modules in TeamsJS v1.x) sample.
 
-This bot has been created using [Bot Framework](https://dev.botframework.com). It shows how to fetch a Task Module from a Hero Card button and receive input from an Adaptive Card in the Task Module.
+This bot has been created using [Bot Framework](https://dev.botframework.com). It shows how to fetch a Dialog (referred as task modules in TeamsJS v1.x) from a Hero Card button and receive input from an Adaptive Card in the Dialog (referred as task modules in TeamsJS v1.x).
 
 ## Included Features
 * Bots
 * Tabs
-* Task Modules
+* Dialogs (referred as task modules in TeamsJS v1.x)
 
 ## Interaction with botss
-![Task Module App](Images/TaskModule.gif)
+![Dialog App](Images/TeamsDialog.gif)
 
 ## Try it yourself - experience the App in your Microsoft Teams client
 Please find below demo manifest which is deployed on Microsoft Azure and you can try it yourself by uploading the app package (.zip file link below) to your teams and/or as a personal app. (Sideloading must be enabled for your tenant, [see steps here](https://docs.microsoft.com/microsoftteams/platform/concepts/build-and-test/prepare-your-o365-tenant#enable-custom-teams-apps-and-turn-on-custom-app-uploading)).
 
-**Teams Task Module:** [Manifest](/samples/bot-task-module/csharp/demo-manifest/bot-task-module.zip)
+**Teams Dialog (referred as task modules in TeamsJS v1.x):** [Manifest](/samples/bot-task-module/csharp/demo-manifest/bot-task-module.zip)
 
 ## Prerequisites
 
@@ -120,37 +120,45 @@ In Azure portal, create a [Azure Bot resource](https://docs.microsoft.com/azure/
 
 > Note this `manifest.json` specified that the bot will be installed in "personal", "team" and "groupchat" scope which is why you immediately entered a one on one chat conversation with the bot. You can at mention the bot in a group chat or in a Channel in the Team you installed it in. Please refer to Teams documentation for more details.
 
-You can interact with this bot by sending it a message. The bot will respond with a Hero Card and Adaptive Card with buttons which will display a Task Module when clicked. The Task Modules demonstrate retrieving input from a user, or displaying custom web page content.
+You can interact with this bot by sending it a message. The bot will respond with a Hero Card and Adaptive Card with buttons which will display a Dialog (referred as task modules in TeamsJS v1.x) when clicked. The Dialogs (referred as task modules in TeamsJS v1.x) demonstrate retrieving input from a user, or displaying custom web page content.
 
 - **Personal Scope Interactions:**
 
-![ps-AddApp ](Images/1.Install.png)
+![1.Install ](Images/1.Install.png)
 
-![ps-Cards ](Images/2.Interaction_with_Bot.png)
+![2.Interaction_with_Bot ](Images/2.Interaction_with_Bot.png)
 
-![ps-AC-TaskModule ](Images/3.Adaptive_card_in_chat.png)
+![3.Adaptive_card_in_chat ](Images/3.Adaptive_card_in_chat.png)
 
-![ps-AC-TaskModule-Submit ](Images/4.Adaptive_card_submitted.png)
+![4.Adaptive_card_submitted ](Images/4.Adaptive_card_submitted.png)
 
-- **Group Chat Scope Interactions:**
+![5.Update_in_chat ](Images/5.Update_in_chat.png)
+
+![6.CustomForm ](Images/6.CustomForm.png)
+
+![7.CustomFormResults ](Images/7.CustomFormResults.png)
 
-![gc-Interaction ](Images/5.Update_in_chat.png)
+- **Dialog (referred as task modules in TeamsJS v1.x) Tab:**
 
-- **Team Scope Interactions:**
+![8.Tasks_Tab_in_chat](Images/8.Tasks_Tab_in_chat.png)
 
-![ts-Interaction ](Images/6.Interaction_with_bot_in_GC.png)
+![9.Youtuube_in_chat](Images/9.Youtuube_in_chat.png)
 
-- **Task Module Tab:**
+![10.Powerapp_in_Tab](Images/10.Powerapp_in_Tab.png)
 
-![TaskModuleTasks](Images/8.Tasks_Tab_in_chat.png)
+![11.Custom_form_in_Tab](Images/11.Custom_form_in_Tab.png)
 
-![Youtube](Images/9.Youtuube_in_chat.png)
+![12.GroupChat](Images/12.GroupChat.png)
 
-![PowerApp](Images/10.Powerapp_in_Tab.png)
+![13.ConfigTab](Images/13.ConfigTab.png)
+
+![14.ConfigTabResults](Images/14.ConfigTabResults.png)
+
+- **Group Chat Scope Interactions:**
 
-![CustomForm](Images/11.Custom_form_in_Tab.png)
+![15.GroupChatCard ](Images/15.GroupChatCard.png)
 
-![AdaptiveCard](Images/7.AdaptiveCard.png)
+![15.GroupChatCardResults ](Images/15.GroupChatCardResults.png)
 
 ## Deploy the bot to Azure
 
@@ -162,7 +170,7 @@ To learn more about deploying a bot to Azure, see [Deploy your bot to Azure](htt
 - [Bot Basics](https://docs.microsoft.com/azure/bot-service/bot-builder-basics?view=azure-bot-service-4.0)
 - [Azure Bot Service Introduction](https://docs.microsoft.com/azure/bot-service/bot-service-overview-introduction?view=azure-bot-service-4.0)
 - [Azure Bot Service Documentation](https://docs.microsoft.com/azure/bot-service/?view=azure-bot-service-4.0)
-- [Task modules](https://learn.microsoft.com/en-us/microsoftteams/platform/task-modules-and-cards/what-are-task-modules)
+- [Dialogs (referred as task modules in TeamsJS v1.x)](https://learn.microsoft.com/en-us/microsoftteams/platform/task-modules-and-cards/what-are-task-modules)
 
 
 <img src="https://pnptelemetry.azurewebsites.net/microsoft-teams-samples/samples/bot-task-module-nodejs" />
\ No newline at end of file
diff --git a/samples/bot-task-module/nodejs/appManifest/manifest.json b/samples/bot-task-module/nodejs/appManifest/manifest.json
index 118f3346ff..d49bea9214 100644
--- a/samples/bot-task-module/nodejs/appManifest/manifest.json
+++ b/samples/bot-task-module/nodejs/appManifest/manifest.json
@@ -15,13 +15,13 @@
     "outline": "outline.png"
   },
   "name": {
-    "short": "Task Module",
-    "full": "Simple Task Module"
-  },
-  "description": {
-    "short": "Test Task Module Scenario",
-    "full": "Simple Task Module Scenario Test"
-  },
+  "short": "Teams Dialogs",
+  "full": "Teams Dialog (referred as task modules in TeamsJS v1.x)"
+},
+"description": {
+  "short": "Teams Dialog (referred as task modules in TeamsJS v1.x)",
+  "full": "This is an sample application which showcases how to invoke dialog (referred as task modules in TeamsJS v1.x) from adaptive and hero cards."
+},
   "accentColor": "#FFFFFF",
   "configurableTabs": [
     {
diff --git a/samples/bot-task-module/nodejs/assets/sample.json b/samples/bot-task-module/nodejs/assets/sample.json
index dbb0f82c03..55fa40b360 100644
--- a/samples/bot-task-module/nodejs/assets/sample.json
+++ b/samples/bot-task-module/nodejs/assets/sample.json
@@ -2,11 +2,11 @@
   {
     "name": "officedev-microsoft-teams-samples-bot-task-module-nodejs",
     "source": "officeDev",
-    "title": "Bot Task Module",
-    "shortDescription": "This is an sample application which showcases how to invoke task module from adaptive and hero cards.",
+    "title": "Bot Dialogs (referred as task modules in TeamsJS v1.x)",
+    "shortDescription": "This is an sample application which showcases how to invoke dialog (referred as task modules in TeamsJS v1.x) from adaptive and hero cards.",
     "url": "https://github.com/OfficeDev/Microsoft-Teams-Samples/tree/main/samples/bot-task-module/nodejs",
     "longDescription": [
-      "This is an sample application which showcases how to invoke task module from adaptive and hero cards."
+      "This is an sample application which showcases how to invoke dialog (referred as task modules in TeamsJS v1.x) from adaptive and hero cards."
     ],
     "creationDateTime": "2022-10-04",
     "updateDateTime": "2023-01-01",
diff --git a/samples/bot-task-module/nodejs/bots/teamsTaskModuleBot.js b/samples/bot-task-module/nodejs/bots/teamsTaskModuleBot.js
index 8f428a95ff..d64a1fc578 100644
--- a/samples/bot-task-module/nodejs/bots/teamsTaskModuleBot.js
+++ b/samples/bot-task-module/nodejs/bots/teamsTaskModuleBot.js
@@ -85,7 +85,7 @@ class TeamsTaskModuleBot extends TeamsActivityHandler {
 
     getTaskModuleHeroCardOptions() {
         return CardFactory.heroCard(
-            'Task Module Invocation from Hero Card',
+            'Dialog (referred as task modules in TeamsJS v1.x) Invocation from Hero Card',
             '',
             null, // No images
             Actions.map((cardType) => {
@@ -109,7 +109,7 @@ class TeamsTaskModuleBot extends TeamsActivityHandler {
             body: [
                 {
                     type: 'TextBlock',
-                    text: 'Task Module Invocation from Adaptive Card',
+                    text: 'Dialog (referred as task modules in TeamsJS v1.x) Invocation from Adaptive Card',
                     weight: 'bolder',
                     size: 3
                 }
diff --git a/samples/bot-task-module/nodejs/pages/CustomForm.html b/samples/bot-task-module/nodejs/pages/CustomForm.html
index 205b66282f..0a5e575f3d 100644
--- a/samples/bot-task-module/nodejs/pages/CustomForm.html
+++ b/samples/bot-task-module/nodejs/pages/CustomForm.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Microsoft Teams Task Module Tester - Custom Form</title>
+    <title>Microsoft Teams Dialogs (referred as task modules in TeamsJS v1.x) Tester - Custom Form</title>
     <link rel="stylesheet" href="/css/msteams-16.css" />
     <link rel="stylesheet" href="/css/Custom.css" />
     <link rel="stylesheet" href="/css/Site.css" />
 
-    <script src="https://statics.teams.cdn.office.net/sdk/v1.5.2/js/MicrosoftTeams.min.js" asp-append-version="true"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
 </head>
 <body class="theme-light">
     <div class="surface" style="height:max-content;">
@@ -21,11 +21,11 @@
             padding-right: 4px;
         }
     </style>
-    <title>Microsoft Teams Task Module App - Custom Form</title>
+    <title>Microsoft Teams Dialogs (referred as task modules in TeamsJS v1.x) App - Custom Form</title>
 </head>
 <body>
     <script>
-        microsoftTeams.initialize();
+        microsoftTeams.app.initialize();
         function validateForm() {
             fetch(`${window.location.origin}/getAppConfig`).then(response => response.json()).then(data => {
             var customerInfo = {
diff --git a/samples/bot-task-module/nodejs/pages/TaskModuleTab.js b/samples/bot-task-module/nodejs/pages/TaskModuleTab.js
index 4640ea62bd..4c2e999a41 100644
--- a/samples/bot-task-module/nodejs/pages/TaskModuleTab.js
+++ b/samples/bot-task-module/nodejs/pages/TaskModuleTab.js
@@ -14,8 +14,7 @@
 
         var taskInfo_1 = {
             title: "",
-            height: "",
-            width: "",
+            size: "",
             url: "",
             card: "",
             fallbackUrl: "",
@@ -238,8 +237,8 @@
                             );
                         };
 
-                        //Task modules invoked from a tab
-                        microsoftTeams.tasks.startTask(taskInfo_1, submitHandler);
+                        //Dialogs (referred as dialogs (referred as task modules in TeamsJS v1.x) in TeamsJS v1.x) invoked from a tab
+                        microsoftTeams.dialog.open(taskInfo_1, submitHandler);
                         break;
 
                     default:
diff --git a/samples/bot-task-module/nodejs/pages/YouTube.html b/samples/bot-task-module/nodejs/pages/YouTube.html
index 6dae38e3b2..5d84d86fb6 100644
--- a/samples/bot-task-module/nodejs/pages/YouTube.html
+++ b/samples/bot-task-module/nodejs/pages/YouTube.html
@@ -3,7 +3,7 @@
 <head>
     <meta name="viewport" content="width=device-width" />
     <title>YouTube</title>
-    <script src="https://statics.teams.cdn.office.net/sdk/v1.5.2/js/MicrosoftTeams.min.js" asp-append-version="true"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
 </head>
 <body>
     <style>
@@ -25,12 +25,12 @@
         }
     </style>
     <script>
-        microsoftTeams.initialize();
+        microsoftTeams.app.initialize();
 
         //- Handle the Esc key
         document.onkeyup = function (event) {
             if ((event.key === 27) || (event.key === "Escape")) {
-                microsoftTeams.tasks.submitTask(null); //- this will return an err object to the completionHandler()
+                microsoftTeams.dialog.submit(null); //- this will return an err object to the completionHandler()
             }
         }</script>
     <div id="embed-container">
diff --git a/samples/bot-task-module/nodejs/pages/configure.html b/samples/bot-task-module/nodejs/pages/configure.html
index 398fd69613..2bfcf04869 100644
--- a/samples/bot-task-module/nodejs/pages/configure.html
+++ b/samples/bot-task-module/nodejs/pages/configure.html
@@ -1,7 +1,5 @@
 <head>
-  <script src="https://res.cdn.office.net/teams-js/2.2.0/js/MicrosoftTeams.min.js"
-    integrity="sha384yBjE++eHeBPzIg+IKl9OHFqMbSdrzY2S/LW3qeitc5vqXewEYRWegByWzBN/chRh" crossorigin="anonymous">
-    </script>
+  <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
 </head>
 
 <body>
@@ -10,7 +8,7 @@
     <p>
       <label for="tabChoice">Select the tab you would like to see: </label>
     <div>
-      <input type="radio" name="tabType" value="tasks" onclick="onClick()">Task Module<br>
+      <input type="radio" name="tabType" value="tasks" onclick="onClick()">Teams Dialogs<br>
       <input type="radio" name="tabType" value="helloworld" onclick="onClick()"> Hello World
     </div>
     </p>
diff --git a/samples/bot-task-module/nodejs/pages/hello.html b/samples/bot-task-module/nodejs/pages/hello.html
index c1875cff54..6ab6db4d5c 100644
--- a/samples/bot-task-module/nodejs/pages/hello.html
+++ b/samples/bot-task-module/nodejs/pages/hello.html
@@ -1,4 +1,4 @@
 
-<div class="font-semibold font-title">Hello, Task Modules!</div>
-<p>Welcome to Microsoft Teams Task Modules sample app (Node.js)</p>
+<div class="font-semibold font-title">Hello, Dialogs (referred as task modules in TeamsJS v1.x)!</div>
+<p>Welcome to Microsoft Teams Dialogs (referred as task modules in TeamsJS v1.x) sample app (Node.js)</p>
   
\ No newline at end of file
diff --git a/samples/bot-task-module/nodejs/pages/powerapp.html b/samples/bot-task-module/nodejs/pages/powerapp.html
index 1935c6aab9..582597f3ac 100644
--- a/samples/bot-task-module/nodejs/pages/powerapp.html
+++ b/samples/bot-task-module/nodejs/pages/powerapp.html
@@ -1,14 +1,12 @@
 <head>
-  <script src="https://res.cdn.office.net/teams-js/2.0.0/js/MicrosoftTeams.min.js"
-    integrity="sha384-QtTBFeFlfRDZBfwHJHYQp7MdLJ2C3sfAEB1Qpy+YblvjavBye+q87TELpTnvlXw4"
-    crossorigin="anonymous"></script>
+  <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
 </head>
 
 <body>
   <iframe id="powerApp" width="720" height="520" style="width: 94%; display: none"
     src="https://web.powerapps.com/webplayer/iframeapp?source=iframe&amp;screenColor=rgba(104,101,171,1)&amp;appId=/providers/Microsoft.PowerApps/apps/a3447344-9220-4868-b45b-07759637be0f"></iframe>
   <div class="surface" id="powerAppError" style="display: none; padding: 20px;">
-    <p>This task module shows an "Asset Checkout" PowerApp (you'll find more information on it <a
+    <p>This dialogs (referred as task modules in TeamsJS v1.x) shows an "Asset Checkout" PowerApp (you'll find more information on it <a
         href="https://powerusers.microsoft.com/t5/Community-Apps-Gallery/Asset-Checkout-Microsoft-sample/td-p/43221"
         target="_blank">here</a>). Unfortunately, PowerApps are tenant-specific. The one in this sample only works on
       the Microsoft.com tenant.</p>
diff --git a/samples/bot-task-module/nodejs/pages/taskmodule.html b/samples/bot-task-module/nodejs/pages/taskmodule.html
index 745ad84bca..34991ab860 100644
--- a/samples/bot-task-module/nodejs/pages/taskmodule.html
+++ b/samples/bot-task-module/nodejs/pages/taskmodule.html
@@ -2,9 +2,7 @@
 //- All rights reserved. -->
 
 <head>
-    <script src="https://res.cdn.office.net/teams-js/2.0.0/js/MicrosoftTeams.min.js"
-            integrity="sha384-QtTBFeFlfRDZBfwHJHYQp7MdLJ2C3sfAEB1Qpy+YblvjavBye+q87TELpTnvlXw4"
-            crossorigin="anonymous"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
 
     <style>
         .dialog-height {
@@ -15,9 +13,9 @@
 </head>
 
 <body>
-    <div class="font-semibold font-title">Microsoft Teams Task Modules Demo</div>
+    <div class="font-semibold font-title">Microsoft Teams Dialogs (referred as task modules in TeamsJS v1.x) Demo</div>
     <p>
-        A task module allows Teams app developers to create one or more custom, modal experiences with custom code or <a src="https://adaptivecards.io">Adaptive cards</a> for their users, particularly useful for initiating and/or
+        A dialog (referred as task modules in TeamsJS v1.x) allows Teams app developers to create one or more custom, modal experiences with custom code or <a src="https://adaptivecards.io">Adaptive cards</a> for their users, particularly useful for initiating and/or
         completing tasks using a GUI that does not litter a Teams conversation with superfluous, intermediate task
         completion
         information.
diff --git a/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/Index.cshtml b/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/Index.cshtml
index ccf5ba8415..974c0f9393 100644
--- a/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/Index.cshtml
+++ b/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/Index.cshtml
@@ -4,9 +4,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Product Inspection demo</title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-    <script src="https://statics.teams.cdn.office.net/sdk/v1.10.0/js/MicrosoftTeams.min.js"
-            integrity="sha384-6oUzHUqESdbT3hNPDDZUa/OunUj5SoxuMXNek1Dwe6AmChzqc6EJhjVrJ93DY/Bv"
-            crossorigin="anonymous"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous">
+    </script>
     <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>
 
@@ -33,7 +32,7 @@
 
     <script>
         $(document).ready(function () {
-            microsoftTeams.initialize();
+            microsoftTeams.app.initialize();
             $("#desktop").attr("src", `${window.location.origin}/Desktop.PNG`);
             $("#laptop").attr("src", `${window.location.origin}/Laptop.PNG`);
             $("#mobile").attr("src", `${window.location.origin}/Mobile.PNG`);
@@ -62,7 +61,7 @@
                 console.log(`Submit handler - err: ${err}`);
             };
 
-            microsoftTeams.tasks.startTask(taskInfo, submitHandler);
+            microsoftTeams.dialog.open(taskInfo, submitHandler);
         }
 
         // Method to open taskmodule that wil redirect user to get product details based on scanned barcode.
@@ -86,7 +85,7 @@
                 console.log(`Submit handler - err: ${err}`);
             };
 
-            microsoftTeams.tasks.startTask(taskInfo, submitHandler);
+            microsoftTeams.dialog.open(taskInfo, submitHandler);
         }
 
     </script>
diff --git a/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ProductDetails.cshtml b/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ProductDetails.cshtml
index 3e482008d1..33c32185f8 100644
--- a/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ProductDetails.cshtml
+++ b/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ProductDetails.cshtml
@@ -5,9 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Product Inspection demo</title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-    <script src="https://statics.teams.cdn.office.net/sdk/v1.10.0/js/MicrosoftTeams.min.js"
-            integrity="sha384-6oUzHUqESdbT3hNPDDZUa/OunUj5SoxuMXNek1Dwe6AmChzqc6EJhjVrJ93DY/Bv"
-            crossorigin="anonymous"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous">
+    </script>
     <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>
 
@@ -19,7 +18,7 @@
     </style>
     <script>
         $(document).ready(function () {
-            microsoftTeams.initialize();
+            microsoftTeams.app.initialize();
 
             let productName = document.getElementById("productName").innerHTML;
             let image = document.getElementById("productImg");
@@ -39,7 +38,7 @@
         );
 
         function viewItems() {
-            microsoftTeams.tasks.submitTask();
+            microsoftTeams.dialog.submit();
         }
     </script>
 </head>
diff --git a/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ScanProduct.cshtml b/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ScanProduct.cshtml
index 16adfb2c05..412dfff68e 100644
--- a/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ScanProduct.cshtml
+++ b/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ScanProduct.cshtml
@@ -2,9 +2,8 @@
 <html lang="en">
 <head>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-    <script src="https://statics.teams.cdn.office.net/sdk/v1.10.0/js/MicrosoftTeams.min.js"
-            integrity="sha384-6oUzHUqESdbT3hNPDDZUa/OunUj5SoxuMXNek1Dwe6AmChzqc6EJhjVrJ93DY/Bv"
-            crossorigin="anonymous"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous">
+    </script>
     <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>
@@ -16,7 +15,7 @@
             $("#wait").hide();
         });
 
-        microsoftTeams.initialize(() => {
+        microsoftTeams.app.initialize().then(() => {
             scanBarCode();
         });
 
@@ -70,53 +69,54 @@
 
         // Method to capture product image
         function captureImage() {
-            microsoftTeams.initialize();
+            microsoftTeams.app.initialize().then(() => {
 
-            // Method to ask for image capture permission and then capture image
-            microsoftTeams.media.captureImage((error, files) => {
-                // If there's any error, an alert shows the error message/code
-                if (error) {
-                    if (error.message) {
-                        alert(" ErrorCode: " + error.errorCode + error.message);
-                    } else {
-                        alert(" ErrorCode: " + error.errorCode);
+                // Method to ask for image capture permission and then capture image
+                microsoftTeams.media.captureImage((error, files) => {
+                    // If there's any error, an alert shows the error message/code
+                    if (error) {
+                        if (error.message) {
+                            alert(" ErrorCode: " + error.errorCode + error.message);
+                        } else {
+                            alert(" ErrorCode: " + error.errorCode);
+                        }
+                    } else if (files) {
+                        image = files[0].content;
+                        $("#productImg").attr("src", "data:image/png;base64," + image);
+                        $("#productStatus").show();
                     }
-                } else if (files) {
-                    image = files[0].content;
-                    $("#productImg").attr("src", "data:image/png;base64,"+image);
-                    $("#productStatus").show();
-                }
+                });
             });
-        };
+        }
 
         function saveProduct(status) {
             var productStatus = status ? "Approved" : "Rejected";
             const formData = new FormData();
             formData.append('productId', productId);
-            formData.append('image', "data:image/png;base64,"+image);
+            formData.append('image', "data:image/png;base64," + image);
             formData.append('status', productStatus);
             $("#productStatus").hide();
             $("#captureImage").hide();
             $("#wait").show();
 
-            setTimeout(function(){
+            setTimeout(function () {
                 $.ajax({
-                url: '@Url.Action("Save", "Home")',
-                type: "POST",
-                data: formData,
-                mimeType: "multipart/form-data",
-                contentType: false,
-                cache: false,
-                processData: false,
-                success: function (response) {
-                    $("#wait").hide();
-                    $("#status").show();
-                },
-                error: function (xhr, textStatus, errorThrown) {
-                    console.log("textStatus: " + textStatus + ", errorThrown:" + errorThrown);
-                },
+                    url: '@Url.Action("Save", "Home")',
+                    type: "POST",
+                    data: formData,
+                    mimeType: "multipart/form-data",
+                    contentType: false,
+                    cache: false,
+                    processData: false,
+                    success: function (response) {
+                        $("#wait").hide();
+                        $("#status").show();
+                    },
+                    error: function (xhr, textStatus, errorThrown) {
+                        console.log("textStatus: " + textStatus + ", errorThrown:" + errorThrown);
+                    },
                 });
-            },700);            
+            }, 700);
         }
     </script>
 </head>
diff --git a/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ViewDetails.cshtml b/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ViewDetails.cshtml
index f28173895b..00db28dd37 100644
--- a/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ViewDetails.cshtml
+++ b/samples/tab-product-inspection/csharp/ProductInspection/Views/Home/ViewDetails.cshtml
@@ -1,11 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <script src="https://statics.teams.cdn.office.net/sdk/v1.11.0/js/MicrosoftTeams.min.js" integrity="sha384-SCVF3m7OvDKnfAilUzYn2yozEvBeP8n/Oq0yTH8VUI70J4AzrqR70jzjdQ6DI8s2" crossorigin="anonymous"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous">
+    </script>
     <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.initialize(() => {
+        microsoftTeams.app.initialize().then(() => {
             scanBarCode();
         });
         var productId;
diff --git a/samples/tab-product-inspection/nodejs/package.json b/samples/tab-product-inspection/nodejs/package.json
index ace852b6b7..a41400629c 100644
--- a/samples/tab-product-inspection/nodejs/package.json
+++ b/samples/tab-product-inspection/nodejs/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "channellifecycle-nodejs",
+  "name": "tab-product-inspection-nodejs",
   "version": "1.0.0",
   "main": "index.js",
   "scripts": {
@@ -14,7 +14,7 @@
   "description": "",
   "dependencies": {
     "@microsoft/microsoft-graph-client": "^3.0.4",
-    "@microsoft/teams-js": "^2.5.0",
+    "@microsoft/teams-js": "^2.6.1",
     "axios": "^0.21.1",
     "body-parser": "^1.19.0",
     "dotenv": "^8.2.0",
@@ -28,4 +28,4 @@
     "esbuild": "^0.18.1",
     "nodemon": "^2.0.7"
   }
-}
+}
\ No newline at end of file
diff --git a/samples/tab-product-inspection/nodejs/views/productDetail.ejs b/samples/tab-product-inspection/nodejs/views/productDetail.ejs
index bb0772915a..5a7903d955 100644
--- a/samples/tab-product-inspection/nodejs/views/productDetail.ejs
+++ b/samples/tab-product-inspection/nodejs/views/productDetail.ejs
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Product Inspection demo</title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-    <script src="https://statics.teams.cdn.office.net/sdk/v1.11.0/js/MicrosoftTeams.min.js" integrity="sha384-SCVF3m7OvDKnfAilUzYn2yozEvBeP8n/Oq0yTH8VUI70J4AzrqR70jzjdQ6DI8s2" crossorigin="anonymous"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
     <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>
     
@@ -37,7 +37,7 @@
         var productDetails = <%-productDetails%>
 
             $(document).ready(function () {
-                microsoftTeams.initialize();
+                microsoftTeams.app.initialize();
 
                 if (productDetails.productId == null) {
                     $("#noProductFound").text("No product found for this Id");
@@ -57,7 +57,7 @@
             });
 
         $("#btnBack").on('click', function (e) {
-            microsoftTeams.tasks.submitTask();
+            microsoftTeams.dialog.submit();
         });
     </script>
 </body>
diff --git a/samples/tab-product-inspection/nodejs/views/scanProduct.ejs b/samples/tab-product-inspection/nodejs/views/scanProduct.ejs
index 34ca1b1f12..e32fc890ef 100644
--- a/samples/tab-product-inspection/nodejs/views/scanProduct.ejs
+++ b/samples/tab-product-inspection/nodejs/views/scanProduct.ejs
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-    <script src="https://statics.teams.cdn.office.net/sdk/v1.11.0/js/MicrosoftTeams.min.js" integrity="sha384-SCVF3m7OvDKnfAilUzYn2yozEvBeP8n/Oq0yTH8VUI70J4AzrqR70jzjdQ6DI8s2" crossorigin="anonymous"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
     <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>
@@ -14,7 +15,7 @@
             $("#wait").hide();
         });
 
-        microsoftTeams.initialize(() => {
+        microsoftTeams.app.initialize().then(() => {
             scanBarCode();
         });
 
@@ -52,44 +53,44 @@
                         productName = "Mobile";
                         $("#captureImage").show();
                     }
-                    else{
+                    else {
                         $("#noProductFound").show();
-                    }  
+                    }
                 }
             }, config);
         }
 
         // Method to capture product image 
         function captureImage() {
-            microsoftTeams.initialize(()=>{
+            microsoftTeams.app.initialize.then(() => {
                 // Method to ask for image capture permission and then capture image
                 microsoftTeams.media.captureImage((error, files) => {
-                // If there's any error, an alert shows the error message/code
-                if (error) {
-                    if (error.message) {
-                        alert(" ErrorCode: " + error.errorCode + error.message);
-                    } else {
-                        alert(" ErrorCode: " + error.errorCode);
+                    // If there's any error, an alert shows the error message/code
+                    if (error) {
+                        if (error.message) {
+                            alert(" ErrorCode: " + error.errorCode + error.message);
+                        } else {
+                            alert(" ErrorCode: " + error.errorCode);
+                        }
+                    } else if (files) {
+                        image = files[0].content;
+                        $("#productName").text("Product Name :" + productName);
+                        document.getElementById("productImage").src = "data:image/png;base64," + image;
+                        $("#productStatus").show();
                     }
-                } else if (files) {
-                    image = files[0].content;
-                    $("#productName").text("Product Name :" + productName);
-                    document.getElementById("productImage").src = "data:image/png;base64," + image;
-                    $("#productStatus").show();
-                }
+                });
             });
-            });     
         };
 
         // Method invoked on approve/reject click.
         function approveRejectProduct(status) {
-            microsoftTeams.initialize();
+            microsoftTeams.app.initialize();
             let formData = new FormData();
 
-            var productDetails= {
-                "productId":productId,
-                "image":"data:image/png;base64," + image,
-                "status": status?"Approved":"Rejected",
+            var productDetails = {
+                "productId": productId,
+                "image": "data:image/png;base64," + image,
+                "status": status ? "Approved" : "Rejected",
                 "productName": productName
             }
 
@@ -113,7 +114,7 @@
                 error: function (jqXhr, textStatus, errorThrown) {
                     console.log('error', errorThrown);
                 }
-                });           
+            });
         }
     </script>
 </head>
@@ -121,16 +122,17 @@
 <body class="theme-light">
     <div class="surface">
         <div class="panel">
-            <label id="noProductFound">This product is not available. Please scan the product from 'All product list'</label>
+            <label id="noProductFound">This product is not available. Please scan the product from 'All product
+                list'</label>
             <div id="captureImage">
                 <input type="button" value="Capture Image" onclick="captureImage()">
-                <br/>
+                <br />
             </div>
             <div id="productStatus">
-                <label id="productName"></label><br/>
-                <img id="productImage" src height="100" width="100"/>
-                <br/>
-                <br/>
+                <label id="productName"></label><br />
+                <img id="productImage" src height="100" width="100" />
+                <br />
+                <br />
                 <button type="button" onclick="approveRejectProduct(true)">Approve</button>
                 <button type="button" onclick="approveRejectProduct(false)">Reject</button>
             </div>
@@ -139,4 +141,5 @@
         </div>
     </div>
 </body>
+
 </html>
\ No newline at end of file
diff --git a/samples/tab-product-inspection/nodejs/views/tab.ejs b/samples/tab-product-inspection/nodejs/views/tab.ejs
index 15cd01d0de..508237f694 100644
--- a/samples/tab-product-inspection/nodejs/views/tab.ejs
+++ b/samples/tab-product-inspection/nodejs/views/tab.ejs
@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Product Inspection demo</title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-    <script src="https://statics.teams.cdn.office.net/sdk/v1.11.0/js/MicrosoftTeams.min.js" integrity="sha384-SCVF3m7OvDKnfAilUzYn2yozEvBeP8n/Oq0yTH8VUI70J4AzrqR70jzjdQ6DI8s2" crossorigin="anonymous"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
     <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>
     <style>
@@ -53,7 +53,7 @@
 
     <script>
         $(document).ready(function () {
-            microsoftTeams.initialize();
+            microsoftTeams.app.initialize();
             $("#desktop").attr("src", `${window.location.origin}/Images/01DU890.png`);
             $("#laptop").attr("src", `${window.location.origin}/Images/01SD001.png`);
             $("#mobile").attr("src", `${window.location.origin}/Images/01PM998.png`);
@@ -74,10 +74,12 @@
             taskInfo.title = "Scan Product";
             taskInfo.height = 510;
             taskInfo.width = 430;
+
             submitHandler = (err, result) => {
                 console.log(`Submit handler - err: ${err}`);
             };
-            microsoftTeams.tasks.startTask(taskInfo, submitHandler);          
+
+            microsoftTeams.dialog.open(taskInfo, submitHandler);          
         })
 
         $("#btnViewProduct").on('click', function (e){
@@ -95,10 +97,12 @@
             taskInfo.title = "View product";
             taskInfo.height = 510;
             taskInfo.width = 430;
+
             submitHandler = (err, result) => {
                 console.log(`Submit handler - err: ${err}`);
             };
-            microsoftTeams.tasks.startTask(taskInfo, submitHandler);
+
+            microsoftTeams.dialog.open(taskInfo, submitHandler);
         })
     </script>
 </body>
diff --git a/samples/tab-product-inspection/nodejs/views/viewProductDetail.ejs b/samples/tab-product-inspection/nodejs/views/viewProductDetail.ejs
index 5ec0277358..32c9d5e752 100644
--- a/samples/tab-product-inspection/nodejs/views/viewProductDetail.ejs
+++ b/samples/tab-product-inspection/nodejs/views/viewProductDetail.ejs
@@ -2,9 +2,7 @@
 <html lang="en">
 
 <head>
-    <script src="https://statics.teams.cdn.office.net/sdk/v1.10.0/js/MicrosoftTeams.min.js"
-        integrity="sha384-6oUzHUqESdbT3hNPDDZUa/OunUj5SoxuMXNek1Dwe6AmChzqc6EJhjVrJ93DY/Bv"
-        crossorigin="anonymous"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
     <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>
@@ -12,7 +10,7 @@
             $("#productStatus").hide();
         });
         
-        microsoftTeams.initialize(() => {
+        microsoftTeams.app.initialize().then(() => {
             scanBarCode();
         });
 
diff --git a/samples/tab-request-approval/csharp/README.md b/samples/tab-request-approval/csharp/README.md
index be9550b282..382281e2ca 100644
--- a/samples/tab-request-approval/csharp/README.md
+++ b/samples/tab-request-approval/csharp/README.md
@@ -202,7 +202,7 @@ The simplest way to run this sample in Teams is to use Teams Toolkit for Visual
 
 ![SendRequest](TabRequestApproval/Images/9.Request_Popup_User2.png)
 
-- On click of notification a task module will open, redirecting the user to the request.
+- On click of notification a dialog (referred as task modules in TeamsJS v1.x) will open, redirecting the user to the request.
 
 ![SendRequest](TabRequestApproval/Images/10.Requests_User1.png)
 
diff --git a/samples/tab-request-approval/csharp/TabRequestApproval/Views/Home/Request.cshtml b/samples/tab-request-approval/csharp/TabRequestApproval/Views/Home/Request.cshtml
index f7bee96306..408d2dfc6f 100644
--- a/samples/tab-request-approval/csharp/TabRequestApproval/Views/Home/Request.cshtml
+++ b/samples/tab-request-approval/csharp/TabRequestApproval/Views/Home/Request.cshtml
@@ -4,9 +4,7 @@
 <html lang="en">
    <head>
       <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
-      <script src="https://statics.teams.cdn.office.net/sdk/v1.6.0/js/MicrosoftTeams.min.js"
-         integrity="sha384-mhp2E+BLMiZLe7rDIzj19WjgXJeI32NkPvrvvZBrMi5IvWup/1NUfS5xuYN5S3VT"
-         crossorigin="anonymous"></script>
+      <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
       <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
       <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>
       <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
@@ -56,7 +54,7 @@
                  data: taskInfo
              });
 
-              microsoftTeams.tasks.submitTask();
+              microsoftTeams.dialog.submit();
          };
       </script>
    </head>
diff --git a/samples/tab-request-approval/csharp/TabRequestApproval/Views/Shared/_Layout.cshtml b/samples/tab-request-approval/csharp/TabRequestApproval/Views/Shared/_Layout.cshtml
index 2c56e61883..539e2ad364 100644
--- a/samples/tab-request-approval/csharp/TabRequestApproval/Views/Shared/_Layout.cshtml
+++ b/samples/tab-request-approval/csharp/TabRequestApproval/Views/Shared/_Layout.cshtml
@@ -14,9 +14,7 @@
     <script src="https://code.jquery.com/jquery-3.1.1.js"
             integrity="sha384-VC7EHu0lDzZyFfmjTPJq+DFyIn8TUGAJbEtpXquazFVr00Q/OOx//RjiZ9yU9+9m"
             crossorigin="anonymous"></script>
-    <script src="https://statics.teams.cdn.office.net/sdk/v1.8.0/js/MicrosoftTeams.min.js"
-            integrity="sha384-mhp2E+BLMiZLe7rDIzj19WjgXJeI32NkPvrvvZBrMi5IvWup/1NUfS5xuYN5S3VT"
-            crossorigin="anonymous"></script>
+    <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
     <script src="~/js/auth.js"></script>
     @RenderSection("Scripts", required: false)
 </body>
diff --git a/samples/tab-request-approval/nodejs/Readme.md b/samples/tab-request-approval/nodejs/Readme.md
index d43b516aed..99b8823116 100644
--- a/samples/tab-request-approval/nodejs/Readme.md
+++ b/samples/tab-request-approval/nodejs/Readme.md
@@ -192,7 +192,7 @@ The simplest way to run this sample in Teams is to use Teams Toolkit for Visual
 
 ![CreateTask](Images/7.CreateTaskDetails.png)
 
-- User-2 On click of notification a task module will open, redirecting the user to the request.
+- User-2 On click of notification a dialog (referred as task modules in TeamsJS v1.x) will open, redirecting the user to the request.
 
 ![SendRequest](Images/8.Activity.png)
 
diff --git a/samples/tab-request-approval/nodejs/views/UserNotification.ejs b/samples/tab-request-approval/nodejs/views/UserNotification.ejs
index 52706b9e96..ece096b31a 100644
--- a/samples/tab-request-approval/nodejs/views/UserNotification.ejs
+++ b/samples/tab-request-approval/nodejs/views/UserNotification.ejs
@@ -3,9 +3,7 @@
     <head>
         <script src="https://unpkg.com/@microsoft/teams-js/dist/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
-        <script src="https://res.cdn.office.net/teams-js/2.0.0/js/MicrosoftTeams.min.js"
-        integrity="sha384-QtTBFeFlfRDZBfwHJHYQp7MdLJ2C3sfAEB1Qpy+YblvjavBye+q87TELpTnvlXw4"
-        crossorigin="anonymous"></script>
+        <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>
         <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
@@ -147,21 +145,27 @@
             {
                 let taskInfo = {
                 title: null,
-                height: null,
-                width: null,
+                size: null,
                 url: null,
                 card: null,
                 fallbackUrl: null,
                 completionBotId: null,
             };
+
+            let taskModuleSize = {
+                height: 400,
+                width: 400,
+             };
+
             taskInfo.url = window.location.origin +"/UserRequest?id="+context.subEntityId;
             taskInfo.title = "View request";
-            taskInfo.height = 400;
-            taskInfo.width = 400;
+            taskInfo.size = taskModuleSize;
+
             submitHandler = (err, result) => {
                 console.log(`Submit handler - err: ${err}`);
             };
-            microsoftTeams.tasks.startTask(taskInfo, submitHandler);
+            
+            microsoftTeams.dialog.open(taskInfo, submitHandler);
             }
         });
             $('#notask').hide();
diff --git a/samples/tab-request-approval/nodejs/views/UserRequest.ejs b/samples/tab-request-approval/nodejs/views/UserRequest.ejs
index adadc686c7..813260072b 100644
--- a/samples/tab-request-approval/nodejs/views/UserRequest.ejs
+++ b/samples/tab-request-approval/nodejs/views/UserRequest.ejs
@@ -3,9 +3,7 @@
     <head>
         <script src="https://unpkg.com/@microsoft/teams-js/dist/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
-        <script src="https://statics.teams.cdn.office.net/sdk/v1.6.0/js/MicrosoftTeams.min.js"
-            integrity="sha384-mhp2E+BLMiZLe7rDIzj19WjgXJeI32NkPvrvvZBrMi5IvWup/1NUfS5xuYN5S3VT"
-            crossorigin="anonymous"></script>
+        <script src="https://res.cdn.office.net/teams-js/2.6.1/js/MicrosoftTeams.min.js" crossorigin="anonymous"></script>
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>
         <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
@@ -58,13 +56,12 @@
     </div>
     <script>
           var data =  <%-data%>
-        microsoftTeams.initialize(()=>{
+        microsoftTeams.app.initialize().then(()=>{
             $("#noRequestFound").hide();
             $("#requestApproved").hide();
             getRequestDetails(); 
-        })
-        // Method to show geo location for given latitude and longitude values.
-        
+        });
+
         function getRequestDetails() {
             if(data == null){
                 $("#productDetails").hide();
@@ -97,8 +94,7 @@
                 contentType: 'application/json',
                 data: JSON.stringify(taskInfo),
                 success: function (data, textStatus, jQxhr) {
-                    microsoftTeams.tasks.submitTask();
-                    
+                    microsoftTeams.dialog.submit();
                 },
                 error: function (jqXhr, textStatus, errorThrown) {
                     console.log('error', errorThrown);
@@ -120,7 +116,7 @@
                 contentType: 'application/json',
                 data: JSON.stringify(taskInfo),
                 success: function (data, textStatus, jQxhr) {
-                    microsoftTeams.tasks.submitTask();
+                    microsoftTeams.dialog.submit();
                 },
                 error: function (jqXhr, textStatus, errorThrown) {
                     console.log('error', errorThrown);