diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bedb3f550..ae37319c6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -28,7 +28,7 @@ resources:
       type: github
       name: Safelite/AzureDevOps
       endpoint: Safelite
-      ref: refs/heads/feature/cloudfront-invalidate
+      ref: refs/tags/t5.5.35
 
 variables:
   - group: Digital-Infrastructure
@@ -37,20 +37,16 @@ variables:
 stages:
   # PR's
   - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-
-      - stage: test
-        displayName: CloudFront invalidate
-        jobs:
-          - job: cloudfrontInvalidate
-            displayName: Invalidate CloudFront Cache
-            container: awscli
-            steps:
-              - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
-                parameters:
-                  awsCliContainer: awscli
-                  distributionId: E1Z709RIBQ6PTS
-                  paths: /fmg/*
-                  awsProfile: $(devDeploymentProfile)
+    - stage: TestFormat
+    displayName: Test Code Format
+    jobs:
+      - job: checkFormatting
+        displayName: Check formatting
+        container: prettier-node
+        steps:
+          - bash: prettier --check "$(Build.SourcesDirectory)/src/**/*.(js|vue)"
+            displayName: Run Prettier check
+            
       - stage: TestPr
         displayName: Run Unit Tests For PullRequest
         jobs:
@@ -60,8 +56,6 @@ stages:
               npmLocation: $(Build.SourcesDirectory)
               testResultsFile: junit.xml
               summaryFileLocation: $(Build.SourcesDirectory)/coverage/cobertura-coverage.xml
-
-
   - ${{ else }}:
       # Dev Build/Deploy
       - stage: Dev
@@ -107,7 +101,13 @@ 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: $(cfDistributionId)
+                        cfDistributionId: $(vueCfDistributionId)
+                    - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
+                      parameters:
+                        awsCliContainer: awscli
+                        distributionId: $(apiCfDistributionId)
+                        paths: /fmg/*
+                        awsProfile: $(devDeploymentProfile)
 
       # QA Build/Deploy
       - stage: Qa
@@ -153,7 +153,13 @@ 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: $(cfDistributionId)
+                        cfDistributionId: $(vueCfDistributionId)
+                    - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
+                      parameters:
+                        awsCliContainer: awscli
+                        distributionId: $(apiCfDistributionId)
+                        paths: /fmg/*
+                        awsProfile: $(qaDeploymentProfile)
 
       # Prod Build/Deploy
       - stage: Prod
@@ -199,7 +205,13 @@ 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: $(cfDistributionId)
+                        cfDistributionId: $(apiCfDistributionId)
+                    - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps
+                      parameters:
+                        awsCliContainer: awscli
+                        distributionId: $(apiCfDistributionId)
+                        paths: /fmg/*
+                        awsProfile: $(prodDeploymentProfile)
           - template: templates/digital/auto-tag.yml@AzureDevOps
             parameters:
               dependsOn: prodBuildDeployment