diff --git a/lib/govuk_tech_docs/version.rb b/lib/govuk_tech_docs/version.rb
index 7963f54a..37d78c3f 100644
--- a/lib/govuk_tech_docs/version.rb
+++ b/lib/govuk_tech_docs/version.rb
@@ -1,3 +1,3 @@
 module GovukTechDocs
-  VERSION = "2.0.12".freeze
+  VERSION = "2.1.0".freeze
 end
diff --git a/lib/source/layouts/_google_tag_manager_js.erb b/lib/source/layouts/_google_tag_manager_js.erb
new file mode 100644
index 00000000..1715bc57
--- /dev/null
+++ b/lib/source/layouts/_google_tag_manager_js.erb
@@ -0,0 +1,12 @@
+<% if config[:tech_docs][:gtm_id].is_a?(String) && !config[:tech_docs][:gtm_id].empty? %>
+  <script>
+    (function(w,d,s,l,i){
+      w[l]=w[l]||[];
+      w[l].push({'gtm.start': new Date().getTime(),event:'gtm.js'});
+      var f=d.getElementsByTagName(s)[0], j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';
+      j.async=true;
+      j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;
+      f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','<%= config[:tech_docs][:gtm_id] %>');
+  </script>
+<% end %>
diff --git a/lib/source/layouts/_google_tag_manager_non_js.erb b/lib/source/layouts/_google_tag_manager_non_js.erb
new file mode 100644
index 00000000..e666b452
--- /dev/null
+++ b/lib/source/layouts/_google_tag_manager_non_js.erb
@@ -0,0 +1,4 @@
+<% if config[:tech_docs][:gtm_id].is_a?(String) && !config[:tech_docs][:gtm_id].empty? %>
+  <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= config[:tech_docs][:gtm_id] %>"
+                    height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+<% end %>
diff --git a/lib/source/layouts/core.erb b/lib/source/layouts/core.erb
index 2237909b..6e7079c1 100644
--- a/lib/source/layouts/core.erb
+++ b/lib/source/layouts/core.erb
@@ -22,10 +22,12 @@
       <%= tag :meta, property: property, content: content %>
     <% end %>
 
+    <%= partial 'layouts/google_tag_manager_js' %>
     <%= yield_content :head %>
   </head>
 
   <body class="govuk-template__body">
+    <%= partial 'layouts/google_tag_manager_non_js' %>
     <script>document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled');</script>
 
     <div class="app-pane">
