diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index e16d319..9a90116 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -31,7 +31,7 @@
       {{ printf `<link rel="%s" type="%s" href="%s" title="%s" />` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
     {{ end -}}
 
-    {{ if .Site.GoogleAnalytics }}
+    {{ if .Site.Config.Services.GoogleAnalytics.ID }}
     {{ partial "cookie-consent.html" . }}
     {{ end }}
 
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index d069ecc..d31ea19 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -83,7 +83,7 @@
   </ul>
   {{ end }}
 
-  {{ if or (ne ($.Param "sharingicons") false) (.Site.DisqusShortname) }}
+  {{ if or (ne ($.Param "sharingicons") false) (.Site.Config.Services.Disqus.Shortname) }}
   <hr>
   <footer>
 
@@ -91,7 +91,7 @@
   {{ partial "sharing-icons.html" . }}
   {{ end }}
 
-  {{ if and (.Site.DisqusShortname) (ne .Params.comments false) }}
+  {{ if and (.Site.Config.Services.Disqus.Shortname) (ne .Params.comments false) }}
   {{ template "_internal/disqus.html" . }}
   {{ end }}
   </footer>
diff --git a/layouts/partials/cookie-consent.html b/layouts/partials/cookie-consent.html
index 4f1a173..96b5970 100644
--- a/layouts/partials/cookie-consent.html
+++ b/layouts/partials/cookie-consent.html
@@ -28,7 +28,7 @@ Haven.create({
         {
             name: 'google-analytics',
             options: {
-                    id: {{ .Site.GoogleAnalytics }},
+                    id: {{ .Site.Config.Services.GoogleAnalytics.ID }},
             },
             purposes: ['analytics'],
             inject: true,