diff --git a/templates/csharp/custom-copilot-assistant-assistants-api/teamsapp.local.yml.tpl b/templates/csharp/custom-copilot-assistant-assistants-api/teamsapp.local.yml.tpl
index fbdbc6f189..d16505e221 100644
--- a/templates/csharp/custom-copilot-assistant-assistants-api/teamsapp.local.yml.tpl
+++ b/templates/csharp/custom-copilot-assistant-assistants-api/teamsapp.local.yml.tpl
@@ -69,14 +69,11 @@ provision:
       description: ""
       channels:
         - name: msteams
-{{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
-
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
@@ -85,13 +82,11 @@ provision:
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
 
-{{^CEAEnabled}}
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
diff --git a/templates/csharp/custom-copilot-assistant-assistants-api/teamsapp.yml.tpl b/templates/csharp/custom-copilot-assistant-assistants-api/teamsapp.yml.tpl
index b5503c4c08..7c4c36d667 100644
--- a/templates/csharp/custom-copilot-assistant-assistants-api/teamsapp.yml.tpl
+++ b/templates/csharp/custom-copilot-assistant-assistants-api/teamsapp.yml.tpl
@@ -41,13 +41,11 @@ provision:
       # Teams Toolkit will download this bicep CLI version from github for you,
       # will use bicep CLI in PATH if you remove this config.
       bicepCliVersion: v0.9.1
-{{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
@@ -55,13 +53,11 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-{{^CEAEnabled}}
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
diff --git a/templates/csharp/custom-copilot-assistant-new/teamsapp.local.yml.tpl b/templates/csharp/custom-copilot-assistant-new/teamsapp.local.yml.tpl
index 52d36d666e..23a50f1d2c 100644
--- a/templates/csharp/custom-copilot-assistant-new/teamsapp.local.yml.tpl
+++ b/templates/csharp/custom-copilot-assistant-new/teamsapp.local.yml.tpl
@@ -67,13 +67,11 @@ provision:
       description: ""
       channels:
         - name: msteams
-{{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
@@ -81,13 +79,11 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-{{^CEAEnabled}}
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
 
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
diff --git a/templates/csharp/custom-copilot-assistant-new/teamsapp.yml.tpl b/templates/csharp/custom-copilot-assistant-new/teamsapp.yml.tpl
index eb11768e49..6fe621d620 100644
--- a/templates/csharp/custom-copilot-assistant-new/teamsapp.yml.tpl
+++ b/templates/csharp/custom-copilot-assistant-new/teamsapp.yml.tpl
@@ -41,13 +41,11 @@ provision:
       # Teams Toolkit will download this bicep CLI version from github for you,
       # will use bicep CLI in PATH if you remove this config.
       bicepCliVersion: v0.9.1
-{{#CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
@@ -55,13 +53,11 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-{{#CEAEnabled}}
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
diff --git a/templates/csharp/custom-copilot-basic/teamsapp.local.yml.tpl b/templates/csharp/custom-copilot-basic/teamsapp.local.yml.tpl
index 2d98fab45c..14b7e17750 100644
--- a/templates/csharp/custom-copilot-basic/teamsapp.local.yml.tpl
+++ b/templates/csharp/custom-copilot-basic/teamsapp.local.yml.tpl
@@ -68,13 +68,11 @@ provision:
       channels:
         - name: msteams
 
-{{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
 
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
@@ -84,13 +82,11 @@ provision:
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
  
-{{^CEAEnabled}}
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
 
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
diff --git a/templates/csharp/custom-copilot-basic/teamsapp.yml.tpl b/templates/csharp/custom-copilot-basic/teamsapp.yml.tpl
index d8e579faa3..6fe621d620 100644
--- a/templates/csharp/custom-copilot-basic/teamsapp.yml.tpl
+++ b/templates/csharp/custom-copilot-basic/teamsapp.yml.tpl
@@ -41,13 +41,11 @@ provision:
       # Teams Toolkit will download this bicep CLI version from github for you,
       # will use bicep CLI in PATH if you remove this config.
       bicepCliVersion: v0.9.1
-{{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
@@ -55,13 +53,11 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-{{^CEAEnabled}}
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
diff --git a/templates/csharp/custom-copilot-rag-azure-ai-search/teamsapp.local.yml.tpl b/templates/csharp/custom-copilot-rag-azure-ai-search/teamsapp.local.yml.tpl
index 9a53194830..e819b66579 100644
--- a/templates/csharp/custom-copilot-rag-azure-ai-search/teamsapp.local.yml.tpl
+++ b/templates/csharp/custom-copilot-rag-azure-ai-search/teamsapp.local.yml.tpl
@@ -75,13 +75,11 @@ provision:
       channels:
         - name: msteams
 
-{{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
@@ -90,12 +88,10 @@ provision:
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
   # Validate app package using validation rules
-{{^CEAEnabled}}
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
diff --git a/templates/csharp/custom-copilot-rag-azure-ai-search/teamsapp.yml.tpl b/templates/csharp/custom-copilot-rag-azure-ai-search/teamsapp.yml.tpl
index f5311e8b58..36c217982d 100644
--- a/templates/csharp/custom-copilot-rag-azure-ai-search/teamsapp.yml.tpl
+++ b/templates/csharp/custom-copilot-rag-azure-ai-search/teamsapp.yml.tpl
@@ -41,13 +41,11 @@ provision:
       # Teams Toolkit will download this bicep CLI version from github for you,
       # will use bicep CLI in PATH if you remove this config.
       bicepCliVersion: v0.9.1
-{{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
@@ -56,12 +54,10 @@ provision:
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
   # Validate app package using validation rules
-{{^CEAEnabled}}
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
diff --git a/templates/csharp/custom-copilot-rag-custom-api/teamsapp.local.yml.tpl b/templates/csharp/custom-copilot-rag-custom-api/teamsapp.local.yml.tpl
index 21e6602ca4..c48343fe1a 100644
--- a/templates/csharp/custom-copilot-rag-custom-api/teamsapp.local.yml.tpl
+++ b/templates/csharp/custom-copilot-rag-custom-api/teamsapp.local.yml.tpl
@@ -67,13 +67,11 @@ provision:
       description: ""
       channels:
         - name: msteams
-{{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
@@ -81,13 +79,11 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-{{^CEAEnabled}}
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
 
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
diff --git a/templates/csharp/custom-copilot-rag-custom-api/teamsapp.yml.tpl b/templates/csharp/custom-copilot-rag-custom-api/teamsapp.yml.tpl
index 4f8a788485..36c217982d 100644
--- a/templates/csharp/custom-copilot-rag-custom-api/teamsapp.yml.tpl
+++ b/templates/csharp/custom-copilot-rag-custom-api/teamsapp.yml.tpl
@@ -41,13 +41,11 @@ provision:
       # Teams Toolkit will download this bicep CLI version from github for you,
       # will use bicep CLI in PATH if you remove this config.
       bicepCliVersion: v0.9.1
-{{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
@@ -55,13 +53,11 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-{{^CEAEnabled}}
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
diff --git a/templates/csharp/custom-copilot-rag-customize/teamsapp.local.yml.tpl b/templates/csharp/custom-copilot-rag-customize/teamsapp.local.yml.tpl
index 465cd89b83..6e98b13d7f 100644
--- a/templates/csharp/custom-copilot-rag-customize/teamsapp.local.yml.tpl
+++ b/templates/csharp/custom-copilot-rag-customize/teamsapp.local.yml.tpl
@@ -67,13 +67,11 @@ provision:
       description: ""
       channels:
         - name: msteams
-{{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
@@ -81,13 +79,11 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-{{^CEAEnabled}}
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
diff --git a/templates/csharp/custom-copilot-rag-customize/teamsapp.yml.tpl b/templates/csharp/custom-copilot-rag-customize/teamsapp.yml.tpl
index 4f8a788485..36c217982d 100644
--- a/templates/csharp/custom-copilot-rag-customize/teamsapp.yml.tpl
+++ b/templates/csharp/custom-copilot-rag-customize/teamsapp.yml.tpl
@@ -41,13 +41,11 @@ provision:
       # Teams Toolkit will download this bicep CLI version from github for you,
       # will use bicep CLI in PATH if you remove this config.
       bicepCliVersion: v0.9.1
-{{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
@@ -55,13 +53,11 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-{{^CEAEnabled}}
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.
diff --git a/templates/csharp/custom-copilot-rag-microsoft365/teamsapp.local.yml.tpl b/templates/csharp/custom-copilot-rag-microsoft365/teamsapp.local.yml.tpl
index 3093de9e42..11e411a7bc 100644
--- a/templates/csharp/custom-copilot-rag-microsoft365/teamsapp.local.yml.tpl
+++ b/templates/csharp/custom-copilot-rag-microsoft365/teamsapp.local.yml.tpl
@@ -90,13 +90,11 @@ provision:
     with:
       manifestPath: ./aad.manifest.json # Relative path to teamsfx folder. Environment variables in manifest will be replaced before apply to AAD app
       outputFilePath: ./build/aad.manifest.${{TEAMSFX_ENV}}.json
-{{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
@@ -104,13 +102,11 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-{{^CEAEnabled}}
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
 
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
diff --git a/templates/csharp/custom-copilot-rag-microsoft365/teamsapp.yml.tpl b/templates/csharp/custom-copilot-rag-microsoft365/teamsapp.yml.tpl
index 0b35a5b9f9..45ed3ec2c4 100644
--- a/templates/csharp/custom-copilot-rag-microsoft365/teamsapp.yml.tpl
+++ b/templates/csharp/custom-copilot-rag-microsoft365/teamsapp.yml.tpl
@@ -59,13 +59,11 @@ provision:
     with:
       manifestPath: ./aad.manifest.json # Relative path to teamsfx folder. Environment variables in manifest will be replaced before apply to AAD app
       outputFilePath: ./build/aad.manifest.${{TEAMSFX_ENV}}.json
-{{^CEAEnabled}}
   # Validate using manifest schema
   - uses: teamsApp/validateManifest
     with:
       # Path to manifest template
       manifestPath: ./appPackage/manifest.json
-{{/CEAEnabled}}
   # Build Teams app package with latest env value
   - uses: teamsApp/zipAppPackage
     with:
@@ -73,13 +71,11 @@ provision:
       manifestPath: ./appPackage/manifest.json
       outputZipPath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
       outputFolder: ./appPackage/build
-{{^CEAEnabled}}
   # Validate app package using validation rules
   - uses: teamsApp/validateAppPackage
     with:
       # Relative path to this file. This is the path for built zip file.
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip
-{{/CEAEnabled}}
   # Apply the Teams app manifest to an existing Teams app in
   # Teams Developer Portal.
   # Will use the app id in manifest file to determine which Teams app to update.