diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 207c013be..5d37f238c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,6 +1,6 @@
 trigger:
   branches:
-    include: [ develop, release/* ]
+    include: [develop, release/*]
   paths:
     exclude:
       - deployment/*
@@ -8,7 +8,7 @@ trigger:
       - "*"
 pr:
   branches:
-    include: [ '*' ]
+    include: ["*"]
   paths:
     exclude:
       - deployment/*
@@ -35,144 +35,149 @@ variables:
 stages:
   # PR's
   - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-    - stage: TestPr
-      displayName: Run Unit Tests For PullRequest
-      jobs:
-      - template: templates/digital/vue-jest-run-unit-tests.yml@AzureDevOps
-        parameters:
-          nodeContainer: node
-          npmLocation: $(Build.SourcesDirectory)
-          testResultsFile: junit.xml
-          summaryFileLocation: $(Build.SourcesDirectory)/coverage/cobertura-coverage.xml
+      - stage: TestPr
+        displayName: Run Unit Tests For PullRequest
+        jobs:
+          - template: templates/digital/vue-jest-run-unit-tests.yml@AzureDevOps
+            parameters:
+              nodeContainer: node
+              npmLocation: $(Build.SourcesDirectory)
+              testResultsFile: junit.xml
+              summaryFileLocation: $(Build.SourcesDirectory)/coverage/cobertura-coverage.xml
+
 
-  # Dev Build/Deploy
   - ${{ else }}:
-    - stage: Dev
-      condition: eq(variables['Build.SourceBranch'], variables['dev-branch'] )
-      variables:
-        - group: FixMyGlassDev
-      jobs:
-      - deployment: devBuildDeployment
-        displayName: Build and Deploy FMG - Dev
-        environment: digitalCloud-dev
-        container: node
-        workspace:
-          clean: all
-        strategy:
-          runOnce:
-            deploy:
-              steps:
-                - checkout: self
-                  clean: true
-                - template: templates/digital/step-build-vue.yml@AzureDevOps
-                  parameters:
-                    buildOutputDir: dist
-                    environment: Dev
-                - template: templates/digital/step-deploy-vue.yml@AzureDevOps
-                  parameters:
-                    artifactName: vueDistDev
-                    awsProfile: $(devDeploymentProfile)
-                    outputPath: /fmg/
-                    deployBuckets:
-                      safelite-dev-fmg-us-east-1:
-                        clearFolder: true
-                        deployFolder: ''
-                        region: us-east-1
-                    appDeployVariables:
-                      __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__)
-                      __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__)
-                      __VUE_APP_HERITAGE_FUNNEL__: $(__VUE_APP_HERITAGE_FUNNEL__)
-                      __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__)
-                    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)
+      # Dev Build/Deploy
+      - stage: Dev
+        condition: eq(variables['Build.SourceBranch'], variables['dev-branch'] )
+        variables:
+          - group: FixMyGlassDev
+        jobs:
+          - deployment: devBuildDeployment
+            displayName: Build and Deploy FMG - Dev
+            environment: digitalCloud-dev
+            container: node
+            workspace:
+              clean: all
+            strategy:
+              runOnce:
+                deploy:
+                  steps:
+                    - checkout: self
+                      clean: true
+                    - template: templates/digital/step-build-vue.yml@AzureDevOps
+                      parameters:
+                        buildOutputDir: dist
+                        environment: Dev
+                    - template: templates/digital/step-deploy-vue.yml@AzureDevOps
+                      parameters:
+                        artifactName: vueDistDev
+                        awsProfile: $(devDeploymentProfile)
+                        outputPath: /fmg/
+                        deployBuckets:
+                          safelite-dev-fmg-us-east-1:
+                            clearFolder: true
+                            deployFolder: ""
+                            region: us-east-1
+                          safelite-dev-fmg-us-east-2:
+                            clearFolder: true
+                            deployFolder: ""
+                            region: us-east-2
+                        appDeployVariables:
+                          __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__)
+                          __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__)
+                          __VUE_APP_HERITAGE_FUNNEL__: $(__VUE_APP_HERITAGE_FUNNEL__)
+                          __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__)
+                        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)
 
+      # QA Build/Deploy
+      - stage: Qa
+        condition: eq(variables['Build.SourceBranch'], variables['qa-branch'] )
+        variables:
+          - group: FixMyGlassQa
+        jobs:
+          - deployment: qaBuildDeployment
+            displayName: Build and Deploy FMG - QA
+            environment: NoApproval-All
+            container: node
+            workspace:
+              clean: all
+            strategy:
+              runOnce:
+                deploy:
+                  steps:
+                    - checkout: self
+                      clean: true
+                    - template: templates/digital/step-build-vue.yml@AzureDevOps
+                      parameters:
+                        buildOutputDir: dist
+                        environment: Qa
+                    - template: templates/digital/step-deploy-vue.yml@AzureDevOps
+                      parameters:
+                        artifactName: vueDistQa
+                        awsProfile: $(qaDeploymentProfile)
+                        outputPath: /fmg/
+                        deployBuckets:
+                          safelite-qa-fmg-us-east-1:
+                            clearFolder: true
+                            deployFolder: ""
+                            region: us-east-1
+                        appDeployVariables:
+                          __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__)
+                          __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__)
+                          __VUE_APP_HERITAGE_FUNNEL__: $(__VUE_APP_HERITAGE_FUNNEL__)
+                          __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__)
+                        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)
 
-  # QA Build/Deploy
-    - stage: Qa
-      condition: eq(variables['Build.SourceBranch'], variables['qa-branch'] )
-      variables:
-        - group: FixMyGlassQa
-      jobs:
-      - deployment: qaBuildDeployment
-        displayName: Build and Deploy FMG - QA
-        environment: NoApproval-All
-        container: node
-        workspace:
-          clean: all
-        strategy:
-          runOnce:
-            deploy:
-              steps:
-                - checkout: self
-                  clean: true
-                - template: templates/digital/step-build-vue.yml@AzureDevOps
-                  parameters:
-                    buildOutputDir: dist
-                    environment: Qa
-                - template: templates/digital/step-deploy-vue.yml@AzureDevOps
-                  parameters:
-                    artifactName: vueDistQa
-                    awsProfile: $(qaDeploymentProfile)
-                    outputPath: /fmg/
-                    deployBuckets:
-                      safelite-qa-fmg-us-east-1:
-                        clearFolder: true
-                        deployFolder: ''
-                        region: us-east-1
-                    appDeployVariables:
-                      __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__)
-                      __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__)
-                      __VUE_APP_HERITAGE_FUNNEL__: $(__VUE_APP_HERITAGE_FUNNEL__)
-                      __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__)
-                    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)
-
-  # Prod Build/Deploy
-    - stage: Prod
-      condition: succeeded('Qa')
-      variables:
-        - group: FixMyGlassProd
-      jobs:
-      - deployment: prodBuildDeployment
-        displayName: Build and Deploy FMG - Prod
-        environment: digitalCloud-prod
-        container: node
-        workspace:
-          clean: all
-        strategy:
-          runOnce:
-            deploy:
-              steps:
-                - checkout: self
-                  clean: true
-                - template: templates/digital/step-build-vue.yml@AzureDevOps
-                  parameters:
-                    buildOutputDir: dist
-                    environment: Prod
-                - template: templates/digital/step-deploy-vue.yml@AzureDevOps
-                  parameters:
-                    artifactName: vueDistProd
-                    awsProfile: $(prodDeploymentProfile)
-                    outputPath: /fmg/
-                    deployBuckets:
-                      safelite-prod-fmg-us-east-1:
-                        clearFolder: true
-                        deployFolder: ''
-                        region: us-east-1
-                    appDeployVariables:
-                      __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__)
-                      __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__)
-                      __VUE_APP_HERITAGE_FUNNEL__: $(__VUE_APP_HERITAGE_FUNNEL__)
-                      __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__)
-                    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)
-      - template: templates/digital/auto-tag.yml@AzureDevOps
-        parameters:
-          userName: SafeliteAzureDevops
-          userEmail: githubazuredevops@safelite.com
\ No newline at end of file
+      # Prod Build/Deploy
+      - stage: Prod
+        condition: succeeded('Qa')
+        variables:
+          - group: FixMyGlassProd
+        jobs:
+          - deployment: prodBuildDeployment
+            displayName: Build and Deploy FMG - Prod
+            environment: digitalCloud-prod
+            container: node
+            workspace:
+              clean: all
+            strategy:
+              runOnce:
+                deploy:
+                  steps:
+                    - checkout: self
+                      clean: true
+                    - template: templates/digital/step-build-vue.yml@AzureDevOps
+                      parameters:
+                        buildOutputDir: dist
+                        environment: Prod
+                    - template: templates/digital/step-deploy-vue.yml@AzureDevOps
+                      parameters:
+                        artifactName: vueDistProd
+                        awsProfile: $(prodDeploymentProfile)
+                        outputPath: /fmg/
+                        deployBuckets:
+                          safelite-prod-fmg-us-east-1:
+                            clearFolder: true
+                            deployFolder: ""
+                            region: us-east-1
+                        appDeployVariables:
+                          __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__)
+                          __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__)
+                          __VUE_APP_HERITAGE_FUNNEL__: $(__VUE_APP_HERITAGE_FUNNEL__)
+                          __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__)
+                        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)
+          - template: templates/digital/auto-tag.yml@AzureDevOps
+            parameters:
+              dependsOn: prodBuildDeployment
+              userName: SafeliteAzureDevops
+              userEmail: githubazuredevops@safelite.com