diff --git a/mkdocs.yml b/mkdocs.yml
index e6eff79e..a9930b14 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -596,6 +596,14 @@ plugins:
         'kb/nginx/get-real-ip-cloudflare.md': 'kb/nginx/get-real-ip-address-behind-cloudflare-nginx.md'
 extra:
   issn: 2755-8169
+  analytics:
+    umami:
+      enabled: true
+      url: umami.breadnet.co.uk
+      siteId: d2bbe8d4-cfec-4f55-9d82-954ce5428c6e
+    cloudflare:
+      enabled: false
+      token: 6a2c80ed9b0c4af39dadb53f62452603
   social:
     - icon: fontawesome/brands/linkedin
       link: https://uk.linkedin.com/in/bradley-stannard
@@ -618,14 +626,6 @@ validation:
     not_found: ignore
     absolute_links: ignore
     unrecognized_links: info
-analytics:
-  matomo:
-    enabled: true
-    url: trace-agent.breadnet.co.uk
-    siteId: 17
-  cloudflare:
-    enabled: false
-    token: 6a2c80ed9b0c4af39dadb53f62452603
 extra_css:
   - stylesheets/custom.css
 copyright: Copyright © 2016 - 2025 Bradley Stannard
diff --git a/overrides/partials/integrations/analytics.html b/overrides/partials/integrations/analytics.html
index 0dbbd18c..2f0b0aef 100644
--- a/overrides/partials/integrations/analytics.html
+++ b/overrides/partials/integrations/analytics.html
@@ -1,23 +1,11 @@
-{%if config.analytics.matomo.enabled %}
-<!-- Matomo -->
-<script>
-    var _paq = window._paq = window._paq || [];
-    /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-    _paq.push(['trackPageView']);
-    _paq.push(['enableLinkTracking']);
-    (function() {
-        var u="//{{ config.analytics.matomo.url }}/";
-        _paq.push(['setTrackerUrl', u+'matomo.php']);
-        _paq.push(['setSiteId', '{{ config.analytics.matomo.siteId }}']);
-        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-        g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-    })();
-</script>
-<!-- End Matomo Code -->
-{% endif %}
-
-{%if config.analytics.cloudflare.enabled %}
+{%if config.extra.analytics.cloudflare.enabled %}
 <!-- Cloudflare Web Analytics -->
-<script defer src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon='{"token": "{{config.analytics.cloudflare.token}}"}'></script>
+<script defer src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon='{"token": "{{config.extra.analytics.cloudflare.token}}"}'></script>
 <!-- End Cloudflare Web Analytics -->
 {% endif %}
+
+{%if config.extra.analytics.umami.enabled %}
+<!-- Umami Web Analytics -->
+<script defer src="https://{{config.extra.analytics.umami.url}}/script.js" data-website-id="{{config.extra.analytics.umami.siteId}}"></script>
+<!-- End Umami Web Analytics -->
+{% endif %}