diff --git a/packages/cli/configs/atk/basic/python/teamsapp.local.yml.hbs b/packages/cli/configs/atk/basic/python/m365agents.local.yml.hbs
similarity index 79%
rename from packages/cli/configs/atk/basic/python/teamsapp.local.yml.hbs
rename to packages/cli/configs/atk/basic/python/m365agents.local.yml.hbs
index 69bf43d53..b0f44ac31 100644
--- a/packages/cli/configs/atk/basic/python/teamsapp.local.yml.hbs
+++ b/packages/cli/configs/atk/basic/python/m365agents.local.yml.hbs
@@ -1,11 +1,11 @@
-# yaml-language-server: $schema=https://aka.ms/teams-toolkit/1.0.0/yaml.schema.json
+# yaml-language-server: $schema=https://aka.ms/m365-agents-toolkits/v1.11/yaml.schema.json
 #
-# The teamsapp.local.yml composes automation tasks for M365 Agents Toolkit when running locally.
+# The m365agents.local.yml composes automation tasks for M365 Agents Toolkit when running locally.
 # This file is used when running Start Debugging (F5) from Visual Studio Code or with the TeamsFx CLI commands.
 # i.e. `teamsfx provision --env local` or `teamsfx deploy --env local`.
 #
 # You can customize this file. Visit https://aka.ms/teamsfx-v5.0-guide for more info about M365 Agents Toolkit project files.
-version: 1.0.0
+version: v1.11
 
 environmentFolderPath: ./env
 
@@ -19,14 +19,18 @@ provision:
     writeToEnvironmentFile:
         teamsAppId: TEAMS_APP_ID
 
-  # Automates the creation an Azure AD app registration which is required for a bot.
-  # The Bot ID (AAD app client ID) and Bot Password (AAD app client secret) are saved to an environment file.
-  - uses: botAadApp/create
+  # Create or reuse an existing Microsoft Entra application for bot.
+  - uses: aadApp/create
     with:
         name: {{ toPascalCase name }}$\{{APP_NAME_SUFFIX}}
+        generateClientSecret: true
+        generateServicePrincipal: true
+        signInAudience: AzureADMultipleOrgs
     writeToEnvironmentFile:
-        botId: BOT_ID
-        botPassword: SECRET_BOT_PASSWORD
+        clientId: BOT_ID
+        clientSecret: SECRET_BOT_PASSWORD
+        objectId: BOT_OBJECT_ID
+        tenantId: AAD_APP_TENANT_ID
 
   # Automates the creation and configuration of a Bot Framework registration which is required for a bot.
   # This configures the bot to use the Azure AD app registration created in the previous step.
@@ -50,7 +54,7 @@ provision:
     with:
         manifestPath: ./appPackage/manifest.json
         outputZipPath: ./appPackage/build/appPackage.$\{{TEAMSFX_ENV}}.zip
-        outputJsonPath: ./appPackage/build/manifest.$\{{TEAMSFX_ENV}}.json
+        outputFolder: ./appPackage/build
 
   # Automates updating the Teams app manifest in Teams Developer Portal using the App ID from the manifest file.
   # This action ensures that any manifest changes are reflected when launching the app again in Teams.
@@ -67,3 +71,4 @@ deploy:
           PORT: 3978
           CLIENT_ID: $\{{BOT_ID}}
           CLIENT_SECRET: $\{{SECRET_BOT_PASSWORD}}
+          TENANT_ID: $\{{TEAMS_APP_TENANT_ID}}
diff --git a/packages/cli/configs/atk/basic/python/teamsapp.testtool.yml b/packages/cli/configs/atk/basic/python/m365agents.testtool.yml
similarity index 77%
rename from packages/cli/configs/atk/basic/python/teamsapp.testtool.yml
rename to packages/cli/configs/atk/basic/python/m365agents.testtool.yml
index d25ef0c11..085eca5fe 100644
--- a/packages/cli/configs/atk/basic/python/teamsapp.testtool.yml
+++ b/packages/cli/configs/atk/basic/python/m365agents.testtool.yml
@@ -1,7 +1,7 @@
-# yaml-language-server: $schema=https://aka.ms/teams-toolkit/v1.5/yaml.schema.json
+# yaml-language-server: $schema=https://aka.ms/m365-agents-toolkits/v1.9/yaml.schema.json
 # Visit https://aka.ms/teamsfx-v5.0-guide for details on this file
 # Visit https://aka.ms/teamsfx-actions for details on actions
-version: v1.5
+version: v1.9
 
 deploy:
   # Install development tool(s)
@@ -16,6 +16,7 @@ deploy:
     with:
       target: ./.env
       envs:
-        PYTHON_ENV: local
         PORT: 3978
         TEAMSFX_NOTIFICATION_STORE_FILENAME: ${{TEAMSFX_NOTIFICATION_STORE_FILENAME}}
+        CLIENT_ID: ""
+        CLIENT_SECRET: ""
diff --git a/packages/cli/configs/atk/basic/python/teamsapp.yml.hbs b/packages/cli/configs/atk/basic/python/m365agents.yml.hbs
similarity index 94%
rename from packages/cli/configs/atk/basic/python/teamsapp.yml.hbs
rename to packages/cli/configs/atk/basic/python/m365agents.yml.hbs
index fba0c4ff9..94765fc18 100644
--- a/packages/cli/configs/atk/basic/python/teamsapp.yml.hbs
+++ b/packages/cli/configs/atk/basic/python/m365agents.yml.hbs
@@ -1,12 +1,12 @@
-# yaml-language-server: $schema=https://aka.ms/teams-toolkit/1.0.0/yaml.schema.json
+# yaml-language-server: $schema=https://aka.ms/m365-agents-toolkits/v1.9/yaml.schema.json
 #
-# The teamsapp.yml composes automation tasks for M365 Agents Toolkit when running other environment configurations.
+# The m365agents.yml composes automation tasks for M365 Agents Toolkit when running other environment configurations.
 # This file is used when selecting the Provision, Deploy, or Publish menu items in the M365 Agents Toolkit for Visual Studio Code window
 # or with the TeamsFx CLI commands.
 # i.e. `teamsfx provision --env {environment name}` or `teamsfx deploy --env {environment name}`.
 #
 # You can customize this file. Visit https://aka.ms/teamsfx-v5.0-guide for more info about M365 Agents Toolkit project files.
-version: 1.0.0
+version: v1.9
 
 environmentFolderPath: ./env
 
@@ -31,6 +31,7 @@ provision:
         name: {{ toPascalCase name }}$\{{APP_NAME_SUFFIX}}
         # If the value is false, the driver will not generate client secret for you
         generateClientSecret: true
+        generateServicePrincipal: true
         # organization's Microsoft Entra tenant (for example, single tenant).
         signInAudience: AzureADMultipleOrgs
     # Write the information of created resources into environment file for the
@@ -78,7 +79,7 @@ provision:
     with:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.$\{{TEAMSFX_ENV}}.zip
-      outputJsonPath: ./appPackage/build/manifest.$\{{TEAMSFX_ENV}}.json
+      outputFolder: ./appPackage/build
 
   # Optional: Automates an app package check for errors that would prevent the app from being published and reports any problems.
   - uses: teamsApp/validateAppPackage
@@ -120,7 +121,7 @@ publish:
     with:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.$\{{TEAMSFX_ENV}}.zip
-      outputJsonPath: ./appPackage/build/manifest.$\{{TEAMSFX_ENV}}.json
+      outputFolder: ./appPackage/build
 
   # Optional: Automates an app package check for errors that would prevent the app from being published and reports any problems.
   - uses: teamsApp/validateAppPackage