diff --git a/docs/assets/js/google-tag-support.js b/docs/assets/js/google-tag-support.js
deleted file mode 100644
index bc7d48a..0000000
--- 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", "community-site")
-        }
-      }
-    }
-  });
diff --git a/mkdocs.yml b/mkdocs.yml
index 8a59d07..eb5966c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -81,8 +81,6 @@ theme:
 
 extra_css:
   - assets/css/gradle.css
-extra_javascript:
-  - assets/js/google-tag-support.js
 
 extra:
   social:
diff --git a/overrides/books.html b/overrides/books.html
index 1a552e4..5dafea9 100644
--- a/overrides/books.html
+++ b/overrides/books.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "main.html" %}
 
 {% block content %}
 {{ super() }}
@@ -24,6 +24,4 @@ <h5>
     </div>
     {% endfor %}
 </div>
-
-
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/overrides/main.html b/overrides/main.html
index 83755f9..73fd789 100644
--- a/overrides/main.html
+++ b/overrides/main.html
@@ -7,9 +7,11 @@
 
 {% block scripts %}
   {{ super() }}
+{% endblock %}
+
+{% block footer %}
+  <!-- Cookie Consent -->
+  <div id="analytics-consent-div"></div>
 
-  <!-- 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) -->
+  {{ super() }}
 {% endblock %}
diff --git a/overrides/partials/integrations/analytics/custom.html b/overrides/partials/integrations/analytics/custom.html
index 79b3311..76aecff 100644
--- a/overrides/partials/integrations/analytics/custom.html
+++ b/overrides/partials/integrations/analytics/custom.html
@@ -1,8 +1,6 @@
 <!-- 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');
-</script>
+<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="community-site">
 <!-- End Google Tag Manager -->
diff --git a/overrides/resources.html b/overrides/resources.html
index 8d9577c..bd3b75d 100644
--- a/overrides/resources.html
+++ b/overrides/resources.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "main.html" %}
 
 {% block content %}
 {{ super() }}
@@ -23,6 +23,4 @@ <h3>
     </div>
   {% endfor %}
 </div>
-
-
 {% endblock %}