diff --git a/Gemfile b/Gemfile
index f2785ab2..8aa42f66 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,6 +19,7 @@ group :jekyll_plugins do
   gem 'jekyll-scholar'
   gem 'jekyll-archives'
   gem "jekyll-resize", git: "https://github.com/UCSD-E4E/jekyll-resize"
+  gem "jekyll-environment-variables"
 end
 
 # Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem
diff --git a/Gemfile.lock b/Gemfile.lock
index 3764501c..4f5287ff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -69,6 +69,8 @@ GEM
       webrick (~> 1.7)
     jekyll-archives (2.2.1)
       jekyll (>= 3.6, < 5.0)
+    jekyll-environment-variables (1.0.1)
+      jekyll (>= 3.0, < 5.x)
     jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-redirect-from (0.16.0)
@@ -138,6 +140,7 @@ DEPENDENCIES
   http_parser.rb (~> 0.6.0)
   jekyll (~> 4.3.4)
   jekyll-archives
+  jekyll-environment-variables
   jekyll-feed (~> 0.12)
   jekyll-redirect-from
   jekyll-resize!
diff --git a/_config.yml b/_config.yml
index 5c96e08c..9f330e2b 100644
--- a/_config.yml
+++ b/_config.yml
@@ -38,6 +38,7 @@ plugins:
   - jekyll-feed
   - jekyll-seo-tag
   - jekyll-redirect-from
+  - jekyll-environment-variables
 
 whitelist:
   - jekyll-redirect-from
diff --git a/_includes/google-analytics.html b/_includes/google-analytics.html
index e9afb209..772b5892 100644
--- a/_includes/google-analytics.html
+++ b/_includes/google-analytics.html
@@ -1,12 +1,9 @@
+<!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.env.google_analytics }}"></script>
 <script>
-if(!(window.doNotTrack === "1" || navigator.doNotTrack === "1" || navigator.doNotTrack === "yes" || navigator.msDoNotTrack === "1")) {
-  (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');
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
 
-  ga('create', '{{ site.google_analytics }}', 'auto');
-  ga('send', 'pageview');
-}
+  gtag('config', '{{ site.env.google_analytics }}');
 </script>
-  
diff --git a/_includes/head.html b/_includes/head.html
index 58e3d193..e0c56fd8 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -34,7 +34,7 @@
   <link rel="shortcut icon" type="image/png" href={{"/assets/favicon-48x48.png" | absolute_url}}>
   <link rel="manifest" href={{"/site.webmanifest" | absolute_url}}>
   {%- feed_meta -%}
-  {%- if jekyll.environment == 'production' and site.google_analytics -%}
+  {%- if jekyll.environment == 'production' and site.env.google_analytics -%}
     {%- include google-analytics.html -%}
   {%- endif -%}
 </head>