diff --git a/docs/assets/js/google-tag-support.js b/docs/assets/js/google-tag-support.js
deleted file mode 100644
index 8df08cf9..00000000
--- a/docs/assets/js/google-tag-support.js
+++ /dev/null
@@ -1,15 +0,0 @@
-// Support for DPE University follow ups
-document.addEventListener("DOMContentLoaded", (event) => {
-    var links = document.getElementsByTagName("a");
-    for (let i = 0; i < links.length; i++) { 
-      var link = links[i]
-      if(link.getAttribute("href")?.startsWith("https://dpeuniversity.gradle.com/")) { 
-        link.setAttribute("promo", "yes")
-        link.setAttribute("promo_offer", "DPEU")
-        link.setAttribute("promo_type", link.getElementsByTagName("a") ? "link" : "image")
-        if (!link.getAttribute("promo_location")) {
-          link.setAttribute("promo_location", "declarative-gradle-site")
-        }
-      }
-    }
-});
diff --git a/docs/theme/main.html b/docs/theme/main.html
index 416d63be..65618c96 100644
--- a/docs/theme/main.html
+++ b/docs/theme/main.html
@@ -8,9 +8,10 @@
 
 {% block scripts %}
   {{ super() }}
+{% endblock %}
 
-  <!-- Google Tag Manager (noscript) -->
-  <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WRTQKGT"
-  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-  <!-- End Google Tag Manager (noscript) -->
+{% block footer %}
+  <!-- Cookie Consent Holder -->
+  <div id="analytics-consent-div"></div>
+  {{ super() }}
 {% endblock %}
diff --git a/docs/theme/partials/integrations/analytics/custom.html b/docs/theme/partials/integrations/analytics/custom.html
index 79b33110..d0c49ceb 100644
--- a/docs/theme/partials/integrations/analytics/custom.html
+++ b/docs/theme/partials/integrations/analytics/custom.html
@@ -1,8 +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-WRTQKGT');
+<link rel="stylesheet" href="https://gradle.org/lib/cookie-consent-banner.css">
+<script id="bt-google-tag-manager-injector" src="https://gradle.org/js/google-tag-analytics.js"
+    consentHolderLocator="#analytics-consent-div"
+    promo_location="declarative-gradle-site">
 </script>
 <!-- End Google Tag Manager -->
diff --git a/mkdocs.yml b/mkdocs.yml
index a7f58b1b..c3d888c1 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -103,8 +103,6 @@ nav:
 
 extra_css:
   - docs/assets/css/gradle.css
-extra_javascript:
-  - docs/assets/js/google-tag-support.js
 
 extra:
   social: