diff --git a/_layouts/base.html b/_layouts/base.html
index 85ffc2ce424..30c2263a967 100755
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -58,7 +58,6 @@
{% endfor %}
-
diff --git a/assets/javascript/tracking.js b/assets/javascript/tracking.js
index 8a92a4b5262..90bdc45d568 100644
--- a/assets/javascript/tracking.js
+++ b/assets/javascript/tracking.js
@@ -1,8 +1,11 @@
-var idSite = 4;
-var matomoTrackingApiUrl = 'https://analytics.ossupstream.org/matomo.php';
-
-var _paq = window._paq = window._paq || [];
-_paq.push(['setTrackerUrl', matomoTrackingApiUrl]);
-_paq.push(['setSiteId', idSite]);
+var _paq = window._paq = window._paq || [];
+/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
\ No newline at end of file
+_paq.push(['enableLinkTracking']);
+(function() {
+ var u="//route-default-test-mscherer-matamo.apps.ospo-osci.z3b1.p1.openshiftapps.com/";
+ _paq.push(['setTrackerUrl', u+'matomo.php']);
+ _paq.push(['setSiteId', '2']);
+ 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);
+})();