diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 777122777..a3ff58ac5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -101,11 +101,16 @@ stages:
                         indexDeployVariables:
                           __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__)
                           __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__)
-                        cfDistributionId: $(vueCfDistributionId)
                     - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
                       parameters:
                         awsCliContainer: awscli
                         distributionId: $(apiCfDistributionId)
+                        paths: /* 
+                        awsProfile: $(devDeploymentProfile)
+                    - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
+                      parameters: 
+                        awsCliContainer: awscli
+                        distributionId: $(cfDistributionId)
                         paths: /fmg/*
                         awsProfile: $(devDeploymentProfile)
 
@@ -153,11 +158,16 @@ stages:
                         indexDeployVariables:
                           __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__)
                           __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__)
-                        cfDistributionId: $(vueCfDistributionId)
                     - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
                       parameters:
                         awsCliContainer: awscli
                         distributionId: $(apiCfDistributionId)
+                        paths: /* 
+                        awsProfile: $(sysDeploymentProfile)
+                    - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
+                      parameters: 
+                        awsCliContainer: awscli
+                        distributionId: $(cfDistributionId)
                         paths: /fmg/*
                         awsProfile: $(sysDeploymentProfile)
                 
@@ -205,11 +215,16 @@ stages:
                         indexDeployVariables:
                           __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__)
                           __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__)
-                        cfDistributionId: $(vueCfDistributionId)
                     - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
                       parameters:
                         awsCliContainer: awscli
                         distributionId: $(apiCfDistributionId)
+                        paths: /* 
+                        awsProfile: $(qaDeploymentProfile)
+                    - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
+                      parameters: 
+                        awsCliContainer: awscli
+                        distributionId: $(cfDistributionId)
                         paths: /fmg/*
                         awsProfile: $(qaDeploymentProfile)
 
@@ -257,11 +272,16 @@ stages:
                         indexDeployVariables:
                           __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__)
                           __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__)
-                        cfDistributionId: $(apiCfDistributionId)
                     - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
                       parameters:
                         awsCliContainer: awscli
                         distributionId: $(apiCfDistributionId)
+                        paths: /* 
+                        awsProfile: $(prodDeploymentProfile)
+                    - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
+                      parameters: 
+                        awsCliContainer: awscli
+                        distributionId: $(cfDistributionId)
                         paths: /fmg/*
                         awsProfile: $(prodDeploymentProfile)
           - template: templates/digital/auto-tag.yml@AzureDevOps