diff --git a/deployment/aws-content-analysis.yaml b/deployment/aws-content-analysis.yaml
index 794c621..11fd99e 100755
--- a/deployment/aws-content-analysis.yaml
+++ b/deployment/aws-content-analysis.yaml
@@ -19,7 +19,7 @@ Parameters:
       - "r4.xlarge.search"
 
 Conditions:
-  EnableAnonymousData: !Equals [ !FindInMap [AnonymousData,SendAnonymousData,Data], true]
+  EnableAnonymousData: !Equals [ !FindInMap [AnonymousData,SendAnonymousData,Data], Yes]
 
 Mappings:
   MediaInsightsEngine:
@@ -34,7 +34,7 @@ Mappings:
       Version: "%%VERSION%%"
   AnonymousData:
     SendAnonymousData:
-      Data: true
+      Data: Yes
 
 Resources:
   # Deploy MIE Framework
@@ -51,10 +51,10 @@ Resources:
             - Version
           - "/media-insights-stack.template"
       Parameters:
-        DeployAnalyticsPipeline: true
-        DeployTestResources: false
+        DeployAnalyticsPipeline: Yes
+        DeployTestResources: No
         MaxConcurrentWorkflows: 5
-        EnableXrayTrace: true
+        EnableXrayTrace: Yes
         SendAnonymousData: !FindInMap [AnonymousData,SendAnonymousData,Data]
         SolutionId: SO0042
         SolutionVersion: "%%VERSION%%"