diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index 88b4727827ce..8a29e26bd5fd 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: '0.127.0'
+          hugo-version: 'latest'
           extended: true
       - name: Build
         env:
@@ -59,7 +59,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: '0.127.0'
+          hugo-version: 'latest'
           extended: true
       - name: Build
         env:
diff --git a/layouts/blog/baseof.html b/layouts/blog/baseof.html
index 296c02e1a468..46a9102ac5b4 100755
--- a/layouts/blog/baseof.html
+++ b/layouts/blog/baseof.html
@@ -33,11 +33,11 @@
                   {{ partial "docs/thirdparty-disclaimer.html" . }}
                 {{- end -}}
               {{- end -}}
-            {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }}
+            {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.Config.Services.GoogleAnalytics.ID)) }}
               {{ partial "feedback.html" .Site.Params.ui.feedback }}
             {{ end }}
 <!--            {{ partial "page-meta-lastmod.html" . }}-->
-            {{ if (.Site.DisqusShortname) }}
+            {{ if (.Site.Config.Services.Disqus.Shortname) }}
               <br />
               {{ partial "disqus-comment.html" . }}
             {{ end }}
diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html
index e2cbe533b74a..5ca065031315 100755
--- a/layouts/docs/baseof.html
+++ b/layouts/docs/baseof.html
@@ -36,10 +36,10 @@
                   {{ partial "docs/thirdparty-disclaimer.html" . }}
                 {{- end -}}
               {{- end -}}
-<!--            {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.GoogleAnalytics)) }}-->
+<!--            {{ if (and (not .Params.hide_feedback) (.Site.Params.ui.feedback.enable) (.Site.Config.Services.GoogleAnalytics.ID)) }}-->
 <!--              {{ partial "feedback.html" .Site.Params.ui.feedback }}-->
 <!--            {{ end }}-->
-            {{ if (.Site.DisqusShortname) }}
+            {{ if (.Site.Config.Services.Disqus.Shortname) }}
               <br />
               {{ partial "disqus-comment.html" . }}
             {{ end }}
diff --git a/layouts/partials/css.html b/layouts/partials/css.html
index 19951b883929..66b3b623d550 100755
--- a/layouts/partials/css.html
+++ b/layouts/partials/css.html
@@ -1,6 +1,6 @@
 <!-- All former base stylesheet links commented out as we are using Docsy for styles. -->
 
-{{ $inServerMode := site.IsServer }}
+{{ $inServerMode := hugo.IsServer }}
 
 {{- if .Params.case_study_styles }}
   {{ $cssOutput := "css/case-studies.css" }}
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index 8406b5fe890c..9c2dcf8c6c5e 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -57,7 +57,7 @@
 {{ $jsSearch = resources.Get "js/offline-search.js" }}
 {{ end }}
 {{ $js := (slice $jsSearch) | resources.Concat "js/main.js" }}
-{{ if .Site.IsServer }}
+{{ if hugo.IsServer }}
 <script src="{{ $js.RelPermalink }}"></script>
 {{ else }}
 {{ $js := $js | minify | fingerprint }}