diff --git a/compair/templates/index-dev.html b/compair/templates/index-dev.html
index 592db81cc..08f1e6a75 100644
--- a/compair/templates/index-dev.html
+++ b/compair/templates/index-dev.html
@@ -192,16 +192,15 @@
             })();
         </script>
         {% if ga_tracking_id %}
-            <!-- Google Analytics -->
-            <script type="text/javascript">
-                (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', '{{ ga_tracking_id }}', 'auto');
-                ga('send', 'pageview');
-            </script>
+            <!-- Global site tag (gtag.js) - Google Analytics -->
+            <script async src="https://www.googletagmanager.com/gtag/js?id={{ ga_tracking_id }}"></script>
+            <script>
+                  window.dataLayer = window.dataLayer || [];
+                  function gtag(){dataLayer.push(arguments);}
+                      gtag('js', new Date());
+
+                  gtag('config', '{{ ga_tracking_id }}');
+            </script>>
         {% endif %}
     </head>
     <body>
diff --git a/compair/templates/index.html b/compair/templates/index.html
index 93f46f7bc..1ee8e2da6 100644
--- a/compair/templates/index.html
+++ b/compair/templates/index.html
@@ -110,16 +110,15 @@
             })();
         </script>
         {% if ga_tracking_id %}
-            <!-- Google Analytics -->
-            <script type="text/javascript">
-                (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');
+            <!-- Global site tag (gtag.js) - Google Analytics -->
+            <script async src="https://www.googletagmanager.com/gtag/js?id={{ ga_tracking_id }}"></script>
+            <script>
+                  window.dataLayer = window.dataLayer || [];
+                  function gtag(){dataLayer.push(arguments);}
+                      gtag('js', new Date());
 
-                ga('create', '{{ ga_tracking_id }}', 'auto');
-                ga('send', 'pageview');
-            </script>
+                  gtag('config', '{{ ga_tracking_id }}');
+            </script>>
         {% endif %}
     </head>
     <body>
