diff --git a/endpoints/common.py b/endpoints/common.py
index b79dca4ff..5de9c3ee8 100644
--- a/endpoints/common.py
+++ b/endpoints/common.py
@@ -209,6 +209,7 @@ def render_page_template(name, route_data=None, **kwargs):
                                        mixpanel_key=app.config.get('MIXPANEL_KEY', ''),
                                        munchkin_key=app.config.get('MUNCHKIN_KEY', ''),
                                        google_tagmanager_key=app.config.get('GOOGLE_TAGMANAGER_KEY', ''),
+                                       google_anaytics_key=app.config.get('GOOGLE_ANALYTICS_KEY', ''),
                                        sentry_public_dsn=app.config.get('SENTRY_PUBLIC_DSN', ''),
                                        is_debug=str(app.config.get('DEBUGGING', False)).lower(),
                                        show_chat=features.SUPPORT_CHAT,
diff --git a/static/js/app.js b/static/js/app.js
index 93e40066e..cec6da259 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -39,7 +39,7 @@ quayDependencies = ['ngRoute', 'chieffancypants.loadingBar', 'cfp.hotkeys', 'ang
                     'mgcrea.ngStrap', 'ngCookies', 'ngSanitize', 'angular-md5', 'pasvaz.bindonce', 'ansiToHtml',
                     'core-ui', 'core-config-setup', 'quayPages', 'infinite-scroll'];
 
-if (window.__config && (window.__config.MIXPANEL_KEY || window.__config.MUNCHKIN_KEY)) {
+if (window.__config && (window.__config.MIXPANEL_KEY || window.__config.MUNCHKIN_KEY || window.__config.GOOGLE_ANALYTICS_KEY)) {
   quayDependencies.push('angulartics');
 }
 
@@ -51,6 +51,10 @@ if (window.__config && window.__config.MUNCHKIN_KEY) {
   quayDependencies.push('angulartics.marketo');
 }
 
+if (window.__config && window.__config.GOOGLE_ANALYTICS_KEY) {
+  quayDependencies.push('angulartics.google.analytics');
+}
+
 // Define the application.
 quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoadingBarProvider) {
   cfpLoadingBarProvider.includeSpinner = false;
diff --git a/templates/base.html b/templates/base.html
index b21d10141..8ea902d6f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -66,9 +66,40 @@
 
     {% if munchkin_key %}
       <script type="text/javascript">
-      document.write(unescape("%3Cscript src='//munchkin.marketo.net/munchkin.js' type='text/javascript'%3E%3C/script%3E"));
+      (function() {
+        var didInit = false;
+        function initMunchkin() {
+          if(didInit === false) {
+            didInit = true;
+            Munchkin.init('{{ munchkin_key }}');
+          }
+        }
+        var s = document.createElement('script');
+        s.type = 'text/javascript';
+        s.async = true;
+        s.src = '//munchkin.marketo.net/munchkin-beta.js';
+        s.onreadystatechange = function() {
+          if (this.readyState == 'complete' || this.readyState == 'loaded') {
+            initMunchkin();
+          }
+        };
+        s.onload = initMunchkin;
+        document.getElementsByTagName('head')[0].appendChild(s);
+      })();
+      </script>
+    {% endif %}
+
+    {% if google_analytics_key %}
+      <script>
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+        ga('create', '{{ google_analytics_key }}', 'auto');
+        ga('send', 'pageview');
+
       </script>
-      <script>Munchkin.init('{{ munchkin_key }}');</script>
     {% endif %}
 
 {% if mixpanel_key %}