diff --git a/caimira/apps/static/js/usage-tracking.js b/caimira/apps/static/js/usage-tracking.js
index 830b9894..19c55026 100644
--- a/caimira/apps/static/js/usage-tracking.js
+++ b/caimira/apps/static/js/usage-tracking.js
@@ -1,43 +1,16 @@
-if (document.location.hostname == "caimira-test.web.cern.ch") {
-  var _paq = _paq || [];
+if (document.location.hostname == "caimira.web.cern.ch") {
+  var _paq = window._paq = window._paq || [];
   if (typeof AuthUserDomain !== 'undefined') {
-      _paq.push(["setCustomVariable", 1, "AuthUserDomain", AuthUserDomain, "visit"]);
+    _paq.push(["setCustomVariable", 1, "AuthUserDomain", AuthUserDomain, "visit"]);
   }
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-  (function () {
-    var u = "//piwik.web.cern.ch/";
-    _paq.push(["setTrackerUrl", u + "piwik.php"]);
-    _paq.push(["setSiteId", "7615"]);
-    var d = document,
-      g = d.createElement("script"),
-      s = d.getElementsByTagName("script")[0];
-    g.type = "text/javascript";
-    g.async = true;
-    g.defer = true;
-    g.src = u + "piwik.js";
-    s.parentNode.insertBefore(g, s);
-  })();
-} else if (document.location.hostname == "caimira.web.cern.ch") {
-  var _paq = _paq || [];
-  if (typeof AuthUserDomain !== 'undefined') {
-      _paq.push(["setCustomVariable", 1, "AuthUserDomain", AuthUserDomain, "visit"]);
-  }
-  _paq.push(["setCustomVariable", 1, "AuthUserDomain", AuthUserDomain, "visit"]);
-  _paq.push(["trackPageView"]);
-  _paq.push(["enableLinkTracking"]);
-  (function () {
-    var u = "//piwik.web.cern.ch/";
-    _paq.push(["setTrackerUrl", u + "piwik.php"]);
-    _paq.push(["setSiteId", "7616"]);
-    var d = document,
-      g = d.createElement("script"),
-      s = d.getElementsByTagName("script")[0];
-    g.type = "text/javascript";
-    g.async = true;
-    g.defer = true;
-    g.src = u + "piwik.js";
-    s.parentNode.insertBefore(g, s);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://webanalytics.web.cern.ch/";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '264']);
+    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);
   })();
 } else {
   console.log(
diff --git a/caimira/apps/templates/base/layout.html.j2 b/caimira/apps/templates/base/layout.html.j2
index 6deef540..73d7637d 100644
--- a/caimira/apps/templates/base/layout.html.j2
+++ b/caimira/apps/templates/base/layout.html.j2
@@ -65,7 +65,7 @@
             <ul class="dropdown-menu dropwown-navbar-colors" style="min-width: 14rem;" aria-labelledby="navbarDropdown">
                 <li><a href="/auth/logout" class="nav-link ml-2">Sign out</a></li>
             </ul>
-            {# Sent to Piwik for statistics #}
+            {# Sent to matomo for statistics #}
             <script>
               var AuthUserDomain = "{{ user.domain() }}";
             </script>