diff --git a/src/Resources/ResourceManager/Implementation/CmdletBase/ResourceWithParameterCmdletBase.cs b/src/Resources/ResourceManager/Implementation/CmdletBase/ResourceWithParameterCmdletBase.cs
index 38e3c67a7089..638a9ae47cfa 100644
--- a/src/Resources/ResourceManager/Implementation/CmdletBase/ResourceWithParameterCmdletBase.cs
+++ b/src/Resources/ResourceManager/Implementation/CmdletBase/ResourceWithParameterCmdletBase.cs
@@ -123,7 +123,7 @@ protected ResourceWithParameterCmdletBase()
         public string TemplateFile { get; set; }
 
         [Parameter(ParameterSetName = TemplateUriParameterObjectParameterSetName,
-            Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Uri to the template file. Supported template file type: json and bicep.")]
+            Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Uri to the template file.")]
         [Parameter(ParameterSetName = TemplateUriParameterFileParameterSetName,
             Mandatory = true, ValueFromPipelineByPropertyName = true)]
         [Parameter(ParameterSetName = TemplateUriParameterUriParameterSetName,
@@ -172,8 +172,7 @@ public ITemplateSpecsClient TemplateSpecsClient
 
         public virtual object GetDynamicParameters()
         {
-            if (BicepUtility.IsBicepFile(TemplateFile) ||
-                BicepUtility.IsBicepFile(TemplateUri))
+            if (BicepUtility.IsBicepFile(TemplateFile))
                 BuildAndUseBicepTemplate();
                 
             if (!this.IsParameterBound(c => c.SkipTemplateParameterPrompt))
@@ -417,15 +416,7 @@ protected string[] GetStaticParameterNames()
 
         protected void BuildAndUseBicepTemplate()
         {
-            if (BicepUtility.IsBicepFile(TemplateFile))
-            {
-                TemplateFile = BicepUtility.BuildFile(this.ExecuteScript<Object>, this.ResolvePath(TemplateFile));
-            }
-
-            if (BicepUtility.IsBicepFile(TemplateUri))
-            {
-                TemplateUri = BicepUtility.BuildFile(this.ExecuteScript<Object>, TemplateUri);
-            }
+            TemplateFile = BicepUtility.BuildFile(this.ExecuteScript<Object>, this.ResolvePath(TemplateFile));
         }
     }
 }
diff --git a/src/Resources/Resources/help/Get-AzDeploymentWhatIfResult.md b/src/Resources/Resources/help/Get-AzDeploymentWhatIfResult.md
index f20b273f34be..636466340f27 100644
--- a/src/Resources/Resources/help/Get-AzDeploymentWhatIfResult.md
+++ b/src/Resources/Resources/help/Get-AzDeploymentWhatIfResult.md
@@ -319,7 +319,7 @@ Accept wildcard characters: False
 ```
 
 ### -TemplateUri
-Uri to the template file. Supported template file type: json and bicep.
+Uri to the template file.
 
 ```yaml
 Type: System.String
diff --git a/src/Resources/Resources/help/Get-AzManagementGroupDeploymentWhatIfResult.md b/src/Resources/Resources/help/Get-AzManagementGroupDeploymentWhatIfResult.md
index b6276867d1d9..dad3ba921539 100644
--- a/src/Resources/Resources/help/Get-AzManagementGroupDeploymentWhatIfResult.md
+++ b/src/Resources/Resources/help/Get-AzManagementGroupDeploymentWhatIfResult.md
@@ -349,7 +349,7 @@ Accept wildcard characters: False
 ```
 
 ### -TemplateUri
-Uri to the template file. Supported template file type: json and bicep.
+Uri to the template file.
 
 ```yaml
 Type: System.String
diff --git a/src/Resources/Resources/help/Get-AzResourceGroupDeploymentWhatIfResult.md b/src/Resources/Resources/help/Get-AzResourceGroupDeploymentWhatIfResult.md
index d044fe4d15a8..b3a36f99dfec 100644
--- a/src/Resources/Resources/help/Get-AzResourceGroupDeploymentWhatIfResult.md
+++ b/src/Resources/Resources/help/Get-AzResourceGroupDeploymentWhatIfResult.md
@@ -344,7 +344,7 @@ Accept wildcard characters: False
 ```
 
 ### -TemplateUri
-Uri to the template file. Supported template file type: json and bicep.
+Uri to the template file.
 
 ```yaml
 Type: System.String
diff --git a/src/Resources/Resources/help/Get-AzTenantDeploymentWhatIfResult.md b/src/Resources/Resources/help/Get-AzTenantDeploymentWhatIfResult.md
index 19d3b7ac6bd4..288584d8e939 100644
--- a/src/Resources/Resources/help/Get-AzTenantDeploymentWhatIfResult.md
+++ b/src/Resources/Resources/help/Get-AzTenantDeploymentWhatIfResult.md
@@ -306,7 +306,7 @@ Accept wildcard characters: False
 ```
 
 ### -TemplateParameterUri
-Uri to the template parameter file. Supported template file type: json and bicep.
+Uri to the template parameter file.
 
 ```yaml
 Type: System.String
diff --git a/src/Resources/Resources/help/New-AzDeployment.md b/src/Resources/Resources/help/New-AzDeployment.md
index 0a7722702f5d..8ad4e4379266 100644
--- a/src/Resources/Resources/help/New-AzDeployment.md
+++ b/src/Resources/Resources/help/New-AzDeployment.md
@@ -412,7 +412,7 @@ Accept wildcard characters: False
 ```
 
 ### -TemplateUri
-Uri to the template file. Supported template file type: json and bicep.
+Uri to the template file.
 
 ```yaml
 Type: System.String
diff --git a/src/Resources/Resources/help/New-AzManagementGroupDeployment.md b/src/Resources/Resources/help/New-AzManagementGroupDeployment.md
index f996fb6be68b..c4b3f02be148 100644
--- a/src/Resources/Resources/help/New-AzManagementGroupDeployment.md
+++ b/src/Resources/Resources/help/New-AzManagementGroupDeployment.md
@@ -440,7 +440,7 @@ Accept wildcard characters: False
 ```
 
 ### -TemplateUri
-Uri to the template file. Supported template file type: json and bicep.
+Uri to the template file.
 
 ```yaml
 Type: System.String
diff --git a/src/Resources/Resources/help/New-AzResourceGroupDeployment.md b/src/Resources/Resources/help/New-AzResourceGroupDeployment.md
index aec6ae0af857..2352289ad06d 100644
--- a/src/Resources/Resources/help/New-AzResourceGroupDeployment.md
+++ b/src/Resources/Resources/help/New-AzResourceGroupDeployment.md
@@ -524,7 +524,7 @@ Accept wildcard characters: False
 ```
 
 ### -TemplateUri
-Specifies the URI of a template file. Supported template file type: json and bicep.
+Specifies the URI of a template file.
 This file can be a custom template or a gallery template that is saved as a JSON file, such as by using **Save-AzResourceGroupGalleryTemplate**.
 
 ```yaml
diff --git a/src/Resources/Resources/help/New-AzTenantDeployment.md b/src/Resources/Resources/help/New-AzTenantDeployment.md
index 37ebdc216396..f51d6004f218 100644
--- a/src/Resources/Resources/help/New-AzTenantDeployment.md
+++ b/src/Resources/Resources/help/New-AzTenantDeployment.md
@@ -407,7 +407,7 @@ Accept wildcard characters: False
 ```
 
 ### -TemplateUri
-Uri to the template file. Supported template file type: json and bicep.
+Uri to the template file.
 
 ```yaml
 Type: System.String
diff --git a/src/Resources/Resources/help/Test-AzDeployment.md b/src/Resources/Resources/help/Test-AzDeployment.md
index 0c31ef2db678..c2ac4fb42439 100644
--- a/src/Resources/Resources/help/Test-AzDeployment.md
+++ b/src/Resources/Resources/help/Test-AzDeployment.md
@@ -302,7 +302,7 @@ Accept wildcard characters: False
 ```
 
 ### -TemplateUri
-Uri to the template file. Supported template file type: json and bicep.
+Uri to the template file.
 
 ```yaml
 Type: System.String
diff --git a/src/Resources/Resources/help/Test-AzManagementGroupDeployment.md b/src/Resources/Resources/help/Test-AzManagementGroupDeployment.md
index b784ad75e244..e8f05c32a49b 100644
--- a/src/Resources/Resources/help/Test-AzManagementGroupDeployment.md
+++ b/src/Resources/Resources/help/Test-AzManagementGroupDeployment.md
@@ -323,7 +323,7 @@ Accept wildcard characters: False
 ```
 
 ### -TemplateUri
-Uri to the template file. Supported template file type: json and bicep.
+Uri to the template file.
 
 ```yaml
 Type: System.String
diff --git a/src/Resources/Resources/help/Test-AzResourceGroupDeployment.md b/src/Resources/Resources/help/Test-AzResourceGroupDeployment.md
index e9446c2c4323..f18c18a538c7 100644
--- a/src/Resources/Resources/help/Test-AzResourceGroupDeployment.md
+++ b/src/Resources/Resources/help/Test-AzResourceGroupDeployment.md
@@ -369,7 +369,7 @@ Accept wildcard characters: False
 ```
 
 ### -TemplateUri
-Specifies the URI of a template file. Supported template file type: json and bicep.
+Specifies the URI of a template file.
 
 ```yaml
 Type: System.String
diff --git a/src/Resources/Resources/help/Test-AzTenantDeployment.md b/src/Resources/Resources/help/Test-AzTenantDeployment.md
index 1850f6d826c7..e7f094de45f8 100644
--- a/src/Resources/Resources/help/Test-AzTenantDeployment.md
+++ b/src/Resources/Resources/help/Test-AzTenantDeployment.md
@@ -304,7 +304,7 @@ Accept wildcard characters: False
 ```
 
 ### -TemplateUri
-Uri to the template file. Supported template file type: json and bicep.
+Uri to the template file.
 
 ```yaml
 Type: System.String