diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 31cc1e0..58cb484 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,13 +7,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - name: Setup ruby
-      uses: ruby/setup-ruby@v1
+    - name: Install Zola
+      uses: taiki-e/install-action@v2
       with:
-        bundler-cache: true
-    - name: Install ruby dependencies
-      run: bundle install
-    - name: Bulid with middleman
-      run: bundle exec middleman build
+        tool: zola@0.22.1
+
+    - name: Build with Zola
+      run: zola build
diff --git a/config.toml b/config.toml
index 44624fe..354ecdf 100644
--- a/config.toml
+++ b/config.toml
@@ -16,3 +16,5 @@ paths = "safe"
 
 [extra]
 keywords = ["flatpak", "linux", "apps", "sandboxing", "xdg-app"]
+matomo_url = "https://webstats.gnome.org/"
+matomo_site_id = 13
diff --git a/templates/base.html b/templates/base.html
index 5a1b9d3..07272d0 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -31,8 +31,26 @@
   {% if config.generate_feeds %}
   <link rel="alternate" type="application/atom+xml" title="Flatpak Press" href="{{ get_url(path='press/atom.xml') }}">
   {% endif %}
+
+  {% if config.extra.matomo_url and config.extra.matomo_site_id %}
+  <script>
+    var _paq = window._paq = window._paq || [];
+    _paq.push(['trackPageView']);
+    _paq.push(['enableLinkTracking']);
+    (function() {
+      var u = {{ config.extra.matomo_url | json_encode | safe }};
+      _paq.push(['setTrackerUrl', u + 'matomo.php']);
+      _paq.push(['setSiteId', '{{ config.extra.matomo_site_id }}']);
+      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>
+  {% endif %}
 </head>
 <body>
+  {% if config.extra.matomo_url and config.extra.matomo_site_id %}
+  <noscript><p><img referrerpolicy="no-referrer-when-downgrade" src="{{ config.extra.matomo_url }}matomo.php?idsite={{ config.extra.matomo_site_id }}&amp;rec=1" style="border:0" alt="" /></p></noscript>
+  {% endif %}
   <div class="hero{% block hero_class %}{% endblock %}">
     <section class="header">
       <h2 id="logo" aria-hidden="true">