diff --git a/config.toml b/config.toml
index a50b679..57b4c56 100644
--- a/config.toml
+++ b/config.toml
@@ -214,7 +214,7 @@ copyright = "© $CURRENT_YEAR $AUTHOR $SEPARATOR Unless otherwise noted, the con
 allowed_domains = [
     { directive = "font-src", domains = ["'self'", "data:"] },
     { directive = "img-src", domains = ["'self'", "https://*", "data:"] },
-    { directive = "script-src", domains = ["'self'", "https://comments.softinio.com/js/embed.min.js", "https://static.cloudflareinsights.com", "https://a.softinio.net"] },
+    { directive = "script-src", domains = ["'self'", "https://comments.softinio.com/js/embed.min.js", "https://static.cloudflareinsights.com"] },
     { directive = "style-src", domains = ["'self'"] },
     { directive = "frame-src", domains = ["player.vimeo.com", "https://www.youtube-nocookie.com", "https://watch.softinio.com", "https://notes.softinio.com/embed"] },
 ]
diff --git a/templates/partials/analytics.html b/templates/partials/analytics.html
new file mode 100644
index 0000000..cf5c0d2
--- /dev/null
+++ b/templates/partials/analytics.html
@@ -0,0 +1,28 @@
+{% set analytics_service = config.extra.analytics.service %}
+{% set analytics_id = config.extra.analytics.id | default(value="") %}
+{% set self_hosted_url = config.extra.analytics.self_hosted_url | default(value="") %}
+
+{% if analytics_service == "goatcounter" %}
+{# Prevent non-demo sites from using the demo analytics account #}
+{% if self_hosted_url == "https://tabi-stats.osc.garden" and config.base_url == "https://welpo.github.io/tabi" or
+self_hosted_url != "https://tabi-stats.osc.garden" %}
+<script async {% if self_hosted_url %} data-goatcounter="{{ self_hosted_url ~ '/count' }}"
+	src="{{ self_hosted_url ~ '/count.js' }}" {% else %}
+	data-goatcounter="https://{{ analytics_id }}.goatcounter.com/count" src="https://gc.zgo.at/count.js" {% endif
+	%}></script>
+{% endif %}
+
+{% elif analytics_service == "umami" %}
+<script async defer {% if self_hosted_url %} data-website-id="{{ analytics_id }}"
+	src="{{ self_hosted_url ~ '/script.js' }}" {% else %} data-website-id="{{ analytics_id }}"
+	src="https://analytics.eu.umami.is/script.js" {% endif %} data-do-not-track="true">
+	</script>
+
+{% elif analytics_service == "plausible" %}
+<script defer data-domain="{{ analytics_id }}"
+	<!--src="{% if self_hosted_url %}{{ self_hosted_url ~ '/js/plausible.js' }}{% else %}https://plausible.io/js/script.js{% endif %}"
+	-->
+		src = "{{ self_hosted_url ~ 'f40-1589-48c0-820b-9643ad0080b2.js' }}"
+			></script>
+
+{% endif %}