diff --git a/Dockerfile b/Dockerfile
index 556d9ace09..d7be8224a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,6 +63,7 @@ ENV TZ=Asia/Tel_Aviv \
     _APP_STATSD_PORT=8125 \
     _APP_SMTP_HOST=smtp \
     _APP_SMTP_PORT=25 \
+    _APP_SETUP=self-hosted \
     _APP_VERSION=$VERSION
 #ENV _APP_SMTP_SECURE ''
 #ENV _APP_SMTP_USERNAME ''
diff --git a/app/controllers/shared/web.php b/app/controllers/shared/web.php
index ffaa6a5b87..e23dc4f9c3 100644
--- a/app/controllers/shared/web.php
+++ b/app/controllers/shared/web.php
@@ -23,8 +23,7 @@ $layout
     ->setParam('protocol', $request->getServer('REQUEST_SCHEME', 'https'))
     ->setParam('domain', $domain)
     ->setParam('home', $request->getServer('_APP_HOME'))
-    ->setParam('api', $request->getServer('_APP_APPWRITE_HOST_CLIENT'))
-    ->setParam('project', $request->getServer('_APP_APPWRITE_ID'))
+    ->setParam('setup', $request->getServer('_APP_SETUP'))
     ->setParam('class', 'unknown')
     ->setParam('icon', '/images/favicon.png')
     ->setParam('roles', $roles)
diff --git a/app/views/console/comps/header.phtml b/app/views/console/comps/header.phtml
index f9cd0289a0..44d4f21e93 100644
--- a/app/views/console/comps/header.phtml
+++ b/app/views/console/comps/header.phtml
@@ -3,9 +3,9 @@
     <div class="list pull-start project-only">
         <label>
             <select
-                data-analytics-event="change"
-                data-analytics-category="console/header"
-                data-analytics-label="Project Switch"
+                data-xanalytics-event="change"
+                data-xanalytics-category="console/header"
+                data-xanalytics-label="Project Switch"
                 data-switch
                 data-ls-bind="{{router.params.project}}"
                 data-unsync="1"
diff --git a/app/views/layouts/default.phtml b/app/views/layouts/default.phtml
index 4c7cd1c49c..ffad883b42 100644
--- a/app/views/layouts/default.phtml
+++ b/app/views/layouts/default.phtml
@@ -4,8 +4,6 @@ use Utopia\Locale\Locale;
 
 $protocol   = $this->getParam('protocol', '');
 $domain     = $this->getParam('domain', '');
-$api        = $this->getParam('api', '');
-$project    = $this->getParam('project', 'console');
 $platforms  = $this->getParam('platforms', []);
 $version    = $this->getParam('version', '0.0.0');
 $isDev      = $this->getParam('isDev', false);
@@ -35,7 +33,7 @@ if(!empty($platforms)) {
     <link rel="icon" type="image/png" href="<?php echo $this->escape($this->getParam('icon', '')); ?>?v=1" />
     <link href="https://fonts.googleapis.com/css?family=Poppins:100,300,400,500,600" rel="stylesheet">
     <link rel="apple-touch-icon" href="/images/apple.png">
-    <link rel="preconnect" href="<?php echo $api; ?>" />
+    <!-- <link rel="preconnect" href="" /> -->
     <?php if (!empty($canonical)): ?>
         <link rel="canonical" href="<?php echo $canonical; ?>" />
     <?php endif; ?>
@@ -67,8 +65,9 @@ if(!empty($platforms)) {
             PROTOCOL: '<?php echo $protocol; ?>',
             DOMAIN: '<?php echo $domain; ?>',
             HOME: '<?php echo $this->escape($this->getParam('home')); ?>',
-            API: '<?php echo $api; ?>/v1',
-            PROJECT: '<?php echo $project; ?>',
+            SETUP: '<?php echo $this->escape($this->getParam('setup')); ?>',
+            API: '/v1',
+            PROJECT: 'console',
             PLATFORMS: <?php echo json_encode($platforms); ?>,
             LOCALE: '<?php echo $this->escape(Locale::getText('settings.locale')); ?>',
             PREFIX: '<?php echo $this->escape($this->getParam('prefix')); ?>',
diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js
index 1f955648de..513e04b558 100644
--- a/public/dist/scripts/app-all.js
+++ b/public/dist/scripts/app-all.js
@@ -2610,8 +2610,8 @@ element.$lsSkip=false;view.render(element);});};let events=event.trim().split(",
 switch(events[y].trim()){case"load":exec();break;case"none":break;case"click":case"change":case"keypress":case"keydown":case"keyup":case"input":case"submit":element.addEventListener(events[y],exec);break;default:document.addEventListener(events[y],exec);}
 if(debug)
 console.log('%cregistered: "'+events[y].trim()+'" ('+service+")","color:blue");}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-event",controller:function(element){var action=element.getAttribute("data-analytics-event")||"click";element.addEventListener(action,function(){var category=element.getAttribute("data-analytics-category")||"undefined";var label=element.getAttribute("data-analytics-label")||"undefined";if(!ga){console.error("Google Analytics ga object is not available");}
-ga("send",{hitType:"event",eventCategory:category,eventAction:action,eventLabel:label});});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-pageview",controller:function(window,router){if(!ga){console.error("Google Analytics ga object is not available");}
-var project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
+ga("send",{hitType:"event",eventCategory:category,eventAction:action,eventLabel:label});});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-pageview",controller:function(window,router,env){if(!ga){console.error("Google Analytics ga object is not available");}
+var project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga('set','dimension2',env.VERSION);ga('set','dimension3',env.SETUP);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
 if(target){target=document.getElementById(target);}
 button.addEventListener("click",function(){var clone=document.createElement(element.tagName);if(element.name){clone.name=element.name;}
 clone.innerHTML=template;clone.className=element.className;view.render(clone);if(target){target.appendChild(clone);}else{button.parentNode.insertBefore(clone,button);}
diff --git a/public/dist/scripts/app.js b/public/dist/scripts/app.js
index 05784a67d1..03bae3daff 100644
--- a/public/dist/scripts/app.js
+++ b/public/dist/scripts/app.js
@@ -336,8 +336,8 @@ element.$lsSkip=false;view.render(element);});};let events=event.trim().split(",
 switch(events[y].trim()){case"load":exec();break;case"none":break;case"click":case"change":case"keypress":case"keydown":case"keyup":case"input":case"submit":element.addEventListener(events[y],exec);break;default:document.addEventListener(events[y],exec);}
 if(debug)
 console.log('%cregistered: "'+events[y].trim()+'" ('+service+")","color:blue");}}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-event",controller:function(element){var action=element.getAttribute("data-analytics-event")||"click";element.addEventListener(action,function(){var category=element.getAttribute("data-analytics-category")||"undefined";var label=element.getAttribute("data-analytics-label")||"undefined";if(!ga){console.error("Google Analytics ga object is not available");}
-ga("send",{hitType:"event",eventCategory:category,eventAction:action,eventLabel:label});});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-pageview",controller:function(window,router){if(!ga){console.error("Google Analytics ga object is not available");}
-var project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
+ga("send",{hitType:"event",eventCategory:category,eventAction:action,eventLabel:label});});}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-analytics-pageview",controller:function(window,router,env){if(!ga){console.error("Google Analytics ga object is not available");}
+var project=router.params["project"]||'None';ga("set","page",window.location.pathname);ga("set","dimension1",project);ga('set','dimension2',env.VERSION);ga('set','dimension3',env.SETUP);ga("send","pageview");}});})(window);(function(window){"use strict";window.ls.container.get("view").add({selector:"data-forms-clone",controller:function(element,document,view){var template=element.innerHTML.toString();var label=element.dataset["label"]||"Add";var icon=element.dataset["icon"]||null;var target=element.dataset["target"]||null;var first=parseInt(element.dataset["first"]||1);var button=document.createElement("button");button.type="button";button.innerText=" "+label+" ";button.classList.add("margin-end");button.classList.add("margin-bottom-small");button.classList.add("reverse");if(icon){var iconElement=document.createElement("i");iconElement.className=icon;button.insertBefore(iconElement,button.firstChild);}
 if(target){target=document.getElementById(target);}
 button.addEventListener("click",function(){var clone=document.createElement(element.tagName);if(element.name){clone.name=element.name;}
 clone.innerHTML=template;clone.className=element.className;view.render(clone);if(target){target.appendChild(clone);}else{button.parentNode.insertBefore(clone,button);}
diff --git a/public/scripts/views/analytics/pageview.js b/public/scripts/views/analytics/pageview.js
index 16673bc737..e09f5346f9 100644
--- a/public/scripts/views/analytics/pageview.js
+++ b/public/scripts/views/analytics/pageview.js
@@ -3,7 +3,7 @@
 
   window.ls.container.get("view").add({
     selector: "data-analytics-pageview",
-    controller: function(window, router) {
+    controller: function(window, router, env) {
       if (!ga) {
         console.error("Google Analytics ga object is not available");
       }
@@ -13,7 +13,8 @@
       ga("set", "page", window.location.pathname);
 
       ga("set", "dimension1", project);
-      //ga('set', 'dimension2', '');
+      ga('set', 'dimension2', env.VERSION);
+      ga('set', 'dimension3', env.SETUP);
 
       ga("send", "pageview");
     }