diff --git a/charts/prl-citizen-frontend/values.preview.template.yaml b/charts/prl-citizen-frontend/values.preview.template.yaml
index 91de2cc961..7379abd31e 100644
--- a/charts/prl-citizen-frontend/values.preview.template.yaml
+++ b/charts/prl-citizen-frontend/values.preview.template.yaml
@@ -18,9 +18,9 @@ nodejs:
     IDAM_WEB_URL: 'https://idam-web-public.{{ .Values.global.environment }}.platform.hmcts.net/login'
     IDAM_API_URL: 'https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net/o/token'
     EQUALITY_URL: 'https://pcq.aat.platform.hmcts.net'
-    CCD_URL: 'https://ccd-data-store-api-prl-ccd-definitions-pr-2541.preview.platform.hmcts.net'
-    DOCUMENT_MANAGEMENT_URL: 'https://ccd-case-document-am-api-prl-ccd-definitions-pr-2541.preview.platform.hmcts.net'
-    COS_URL: 'https://prl-cos-pr-2916.preview.platform.hmcts.net'
+    CCD_URL: 'http://ccd-data-store-api-aat.service.core-compute-aat.internal'
+    DOCUMENT_MANAGEMENT_URL: 'http://ccd-case-document-am-api-aat.service.core-compute-aat.internal'
+    COS_URL: 'http://prl-cos-aat.service.core-compute-aat.internal'
     REASONABLE_ADJUSTMENTS: 'https://cui-ra.aat.platform.hmcts.net'
     FACT_URL: 'http://fact-api-aat.service.core-compute-aat.internal'
     REDIS_HOST: 'prl-citizen-frontend-secondary-redis-{{ .Values.global.environment }}.redis.cache.windows.net'
diff --git a/src/main/steps/common/dashboard-page.njk b/src/main/steps/common/dashboard-page.njk
index 3c326e851b..27e7875a17 100644
--- a/src/main/steps/common/dashboard-page.njk
+++ b/src/main/steps/common/dashboard-page.njk
@@ -4,35 +4,12 @@
 {% extends "govuk/template.njk" %}
 
 {% block head %}
-  <!-- Google Tag Manager -->
-
-  <script>
-    (function (w, d, s, l, i) {
-      w[l] = w[l] || [];
-      w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
-      var f = d.getElementsByTagName(s)[0],
-        j = d.createElement(s),
-        dl = l != 'dataLayer'
-          ? '&l=' + l
-          : '';
-      j.async = true;
-      j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
-      f
-        .parentNode
-        .insertBefore(j, f);
-    })(window, document, 'script', 'dataLayer', 'GTM-NJCKLVT');
-  </script>
-  <!-- End Google Tag Manager -->
   {% include "./webpack/css.njk" %}
+  {% include "./views/includes/script-ga_tag_manager.njk" %}
 {% endblock %}
 
 {% block bodyStart %}
-  <!-- Google Tag Manager (noscript) -->
-  <noscript>
-    <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NJCKLVT"
-height="0" width="0" style="display:none;visibility:hidden"></iframe>
-  </noscript>
-  <!-- End Google Tag Manager (noscript) -->
+  {% include "./views/includes/script-ga_tag_manager_2.njk" %}
   <!-- Dynatrace RUM Script -->
   <script type="text/javascript" src="https://js-cdn.dynatrace.com/jstag/17177a07246/bf24054dsx/17472274602522b6_complete.js" crossorigin="anonymous"></script>
   <!-- End Dynatrace RUM Script -->
diff --git a/src/main/steps/common/page.njk b/src/main/steps/common/page.njk
index e3a00d71ce..039079565f 100644
--- a/src/main/steps/common/page.njk
+++ b/src/main/steps/common/page.njk
@@ -4,36 +4,12 @@
 {% extends "govuk/template.njk" %}
 
 {% block head %}
-  <!-- Google Tag Manager -->
-
-  <script>
-    (function (w, d, s, l, i) {
-      w[l] = w[l] || [];
-      w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
-      var f = d.getElementsByTagName(s)[0],
-        j = d.createElement(s),
-        dl = l != 'dataLayer'
-          ? '&l=' + l
-          : '';
-      j.async = true;
-      j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
-      f
-        .parentNode
-        .insertBefore(j, f);
-    })(window, document, 'script', 'dataLayer', 'GTM-NJCKLVT');
-  </script>
-  <!-- End Google Tag Manager -->
-
   {% include "./webpack/css.njk" %}
+  {% include "./views/includes/script-ga_tag_manager.njk" %}
 {% endblock %}
 
 {% block bodyStart %}
-  <!-- Google Tag Manager (noscript) -->
-  <noscript>
-    <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NJCKLVT"
-height="0" width="0" style="display:none;visibility:hidden"></iframe>
-  </noscript>
-  <!-- End Google Tag Manager (noscript) -->
+  {% include "./views/includes/script-ga_tag_manager_2.njk" %}
   <!-- Dynatrace RUM Script -->
   <script type="text/javascript" src="https://js-cdn.dynatrace.com/jstag/17177a07246/bf24054dsx/17472274602522b6_complete.js" crossorigin="anonymous"></script>
   <!-- End Dynatrace RUM Script -->
diff --git a/src/main/steps/common/views/includes/script-ga_tag_manager.njk b/src/main/steps/common/views/includes/script-ga_tag_manager.njk
new file mode 100644
index 0000000000..9e61fc5d54
--- /dev/null
+++ b/src/main/steps/common/views/includes/script-ga_tag_manager.njk
@@ -0,0 +1,7 @@
+<!-- Google Tag Manager -->
+<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','GTM-NJCKLVT');</script>
+<!-- End Google Tag Manager -->
diff --git a/src/main/steps/common/views/includes/script-ga_tag_manager_2.njk b/src/main/steps/common/views/includes/script-ga_tag_manager_2.njk
new file mode 100644
index 0000000000..031c98ea74
--- /dev/null
+++ b/src/main/steps/common/views/includes/script-ga_tag_manager_2.njk
@@ -0,0 +1,5 @@
+<!-- Google Tag Manager (noscript) -->
+<noscript>
+    <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-NJCKLVT" height="0" width="0" style="display:none;visibility:hidden"></iframe>
+</noscript>
+<!-- End Google Tag Manager (noscript) -->
\ No newline at end of file