diff --git a/src/layouts/404.hbs b/src/layouts/404.hbs
index 662b242..0caff6f 100644
--- a/src/layouts/404.hbs
+++ b/src/layouts/404.hbs
@@ -1,10 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+{{> head-first}}
     <title>{{{detag (or page.title 'Page Not Found')}}}{{#if site.title}} | {{{site.title}}}{{/if}}</title>
-{{> head}}
+{{> head-last}}
   </head>
   <body class="status-404">
 {{> header}}
diff --git a/src/layouts/default.hbs b/src/layouts/default.hbs
index a652857..bc05c24 100644
--- a/src/layouts/default.hbs
+++ b/src/layouts/default.hbs
@@ -1,20 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8">
-{{> head-redirect}}
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+{{> head-first}}
     <title>{{{detag (or page.title 'Untitled')}}}{{#if site.title}} | {{{site.title}}}{{/if}}</title>
     {{#if page.canonicalUrl}}
     <link rel="canonical" href="{{page.canonicalUrl}}">
     {{/if}}
-    {{#if page.description}}
-    <meta name="description" content="{{page.description}}">
-    {{/if}}
-    {{#if page.keywords}}
-    <meta name="keywords" content="{{page.keywords}}">
-    {{/if}}
-{{> head}}
+{{> head-last}}
   </head>
   <body class="article">
 {{> header}}
diff --git a/src/layouts/home.hbs b/src/layouts/home.hbs
index 3158f6a..889756a 100644
--- a/src/layouts/home.hbs
+++ b/src/layouts/home.hbs
@@ -1,20 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="utf-8">
-{{> head-redirect}}
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+{{> head-first}}
     <title>Couchbase Documentation</title>
     {{#if site.url}}
     <link rel="canonical" href="{{site.url}}">
     {{/if}}
-    {{#if page.description}}
-    <meta name="description" content="{{page.description}}">
-    {{/if}}
-    {{#if page.keywords}}
-    <meta name="keywords" content="{{page.keywords}}">
-    {{/if}}
-{{> head}}
+{{> head-last}}
   </head>
   <body class="home">
 {{> header}}
diff --git a/src/partials/head-first.hbs b/src/partials/head-first.hbs
new file mode 100644
index 0000000..dc53e80
--- /dev/null
+++ b/src/partials/head-first.hbs
@@ -0,0 +1,8 @@
+    <meta charset="utf-8">
+    {{#if (eq env.FORCE_HTTPS 'true')}}
+    <script>(function(l,p){if(l.protocol!==p)l.protocol=p})(location,'https:')</script>
+    {{/if}}
+    {{#if site.keys.googleAnalytics}}
+    <script>(function(w,d,s,l,i){(w[l]=w[l]||[]).push({'gtm.start':+new Date(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],g=d.createElement(s);g.async=true;g.src='https://www.googletagmanager.com/gtm.js?id='+i;f.parentNode.insertBefore(g,f)})(window,document,'script','dataLayer','{{site.keys.googleAnalytics}}')</script>
+    {{/if}}
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
diff --git a/src/partials/head-last.hbs b/src/partials/head-last.hbs
new file mode 100644
index 0000000..ae71c44
--- /dev/null
+++ b/src/partials/head-last.hbs
@@ -0,0 +1,3 @@
+    <link rel="stylesheet" href="{{uiRootPath}}/css/site.css">
+{{> head-meta}}
+{{> head-scripts}}
diff --git a/src/partials/head-meta.hbs b/src/partials/head-meta.hbs
index ae8bbf5..6ee5d7b 100644
--- a/src/partials/head-meta.hbs
+++ b/src/partials/head-meta.hbs
@@ -1,4 +1,10 @@
     {{#if page.component}}
+    {{#if page.description}}
+    <meta name="description" content="{{page.description}}">
+    {{/if}}
+    {{#if page.keywords}}
+    <meta name="keywords" content="{{page.keywords}}">
+    {{/if}}
     <link rel="schema.dcterms" href="https://purl.org/dc/terms/">
     <meta name="dcterms.subject" content="{{page.component.name}}">
     <meta name="dcterms.identifier" content="{{page.version}}">
@@ -6,5 +12,4 @@
     {{#if (or antoraVersion site.antoraVersion)}}
     <meta name="generator" content="Antora {{or antoraVersion site.antoraVersion}}">
     {{/if}}
-    <link rel="stylesheet" href="{{uiRootPath}}/css/site.css">
     <link rel="icon" href="{{uiRootPath}}/img/favicon.ico" type="image/x-icon">
diff --git a/src/partials/head-redirect.hbs b/src/partials/head-redirect.hbs
deleted file mode 100644
index 7eae7c0..0000000
--- a/src/partials/head-redirect.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-    {{#if (eq env.FORCE_HTTPS 'true')}}
-    <script>;(function(l,p){if(l.protocol !== p)l.protocol=p})(location,"https:")</script>
-    {{/if}}
diff --git a/src/partials/head-scripts.hbs b/src/partials/head-scripts.hbs
index d113389..e69de29 100644
--- a/src/partials/head-scripts.hbs
+++ b/src/partials/head-scripts.hbs
@@ -1,6 +0,0 @@
-{{#if site.keys.googleAnalytics}}
-{{#with site.keys.googleAnalytics}}
-    <script async src="https://www.googletagmanager.com/gtag/js?id={{this}}"></script>
-    <script>dataLayer=window.dataLayer||[];function gtag(){dataLayer.push(arguments)};gtag('js',new Date());gtag('config','{{this}}')</script>
-{{/with}}
-{{/if}}
diff --git a/src/partials/head.hbs b/src/partials/head.hbs
deleted file mode 100644
index b4ee621..0000000
--- a/src/partials/head.hbs
+++ /dev/null
@@ -1,2 +0,0 @@
-{{> head-meta}}
-{{> head-scripts}}
