diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 5ceb041c6e8d..191c310f4c33 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -24,7 +24,8 @@ jobs:
         #hugo-version: '0.91.2'
         #hugo-version : '0.93.2'
         #hugo-version : '0.107.0'
-        hugo-version: '0.110.0'
+        #hugo-version: '0.110.0'
+        hugo-version: '0.139.3'
         extended: true
 
     - name: Build
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1eb71ad5679f..5b752e41de04 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,8 @@ jobs:
     - name: Setup Hugo
       uses: peaceiris/actions-hugo@v2
       with:
-        hugo-version: '0.75.1'
+        #hugo-version: '0.75.1'
+        hugo-version: '0.139.3'
         extended: true
 
     - name: Build
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index 49ea68b37847..03de85ae6e62 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -28,13 +28,7 @@
 
                         <div id="post-content">
                           {{ .Content }}
-                        </div>
-                        <!-- /#post-content -->
-                        {{ if .Site.DisqusShortname }}
-                        <div id="comments">
-                            {{ template "_internal/disqus.html" . }}
-                        </div>
-                        {{ end }}
+                        </div>                        
 
                     </div>
                     <!-- /#blog-post -->
diff --git a/layouts/partials/debugprint.html b/layouts/partials/debugprint.html
index 4087b785031a..d83f6c2d4a51 100644
--- a/layouts/partials/debugprint.html
+++ b/layouts/partials/debugprint.html
@@ -72,8 +72,8 @@
 {{ else if $typeIsSpecial }}
     <div class="debugprint">
         {{ if $typeIsSiteInfo }}
-            {{ $siteVarNames   := (slice "Title" "Author" "Social" "LastChange" "DisqusShortname" "GoogleAnalytics" "Copyright" "RSSLink" "LanguageCode" "BuildDrafts" "Params") }}
-            {{ $siteVarSymbols := (slice .Title  .Author  .Social  .LastChange  .DisqusShortname  .GoogleAnalytics  .Copyright  .RSSLink  .LanguageCode  .BuildDrafts  .Params ) }}
+            {{ $siteVarNames   := (slice "Title" "Author" "Social" "LastChange" "GoogleAnalytics" "Copyright" "RSSLink" "LanguageCode" "BuildDrafts" "Params") }}
+            {{ $siteVarSymbols := (slice .Title  .Author  .Social  .LastChange  .GoogleAnalytics  .Copyright  .RSSLink  .LanguageCode  .BuildDrafts  .Params ) }}
             <table>
                 <tr><th class="key">SiteInfo Variable</th><th class="value">Value</th></tr>
                 {{ range $idx, $elem := $siteVarNames }}
diff --git a/layouts/partials/widgets/session-clues.html b/layouts/partials/widgets/session-clues.html
index 01613fa88f0b..11ff2b4f0f85 100644
--- a/layouts/partials/widgets/session-clues.html
+++ b/layouts/partials/widgets/session-clues.html
@@ -14,10 +14,7 @@
     {{ end }}
     {{ if eq .Params.type "product-session" }}
         <li><a href="{{ ref . "/faq/onsite-summit/session-types.md#product-session" }}"><i class="fa fa-dollar"></i> product session </a></li>
-     {{ end }}
-   {{ if eq .Params.type "training-session" }}
-    <li><a href="{{ ref . "/training" }}"><i class="fa fa-user-circle"></i> training session </a></li>
-   {{ end }}
+     {{ end }}   
     {{ if eq .Params.status "featured" }}
         <li><a class="bg-success" href=""><i class="fa fa-check-square-o"></i> featured </a></li>
     {{ end }}
diff --git a/layouts/training-session/single.html b/layouts/training-session/single.html
index 22b9b13b7001..65254e9b14c2 100644
--- a/layouts/training-session/single.html
+++ b/layouts/training-session/single.html
@@ -29,7 +29,6 @@ <h1>{{ .Title }}</h1>
 
 
     {{ partial "session/register-as-participant.html" . }}
-    <hr/>
-    <a href="/training"> Back to list of all Training Sessions</a>
+    
 
 {{ end }}
diff --git a/themes/oss-owasp/layouts/_default/single.html b/themes/oss-owasp/layouts/_default/single.html
index 49ea68b37847..03de85ae6e62 100644
--- a/themes/oss-owasp/layouts/_default/single.html
+++ b/themes/oss-owasp/layouts/_default/single.html
@@ -28,13 +28,7 @@
 
                         <div id="post-content">
                           {{ .Content }}
-                        </div>
-                        <!-- /#post-content -->
-                        {{ if .Site.DisqusShortname }}
-                        <div id="comments">
-                            {{ template "_internal/disqus.html" . }}
-                        </div>
-                        {{ end }}
+                        </div>                        
 
                     </div>
                     <!-- /#blog-post -->
diff --git a/themes/oss-owasp/layouts/partials/page.html b/themes/oss-owasp/layouts/partials/page.html
index e0eb4df44cab..4d56327c5541 100644
--- a/themes/oss-owasp/layouts/partials/page.html
+++ b/themes/oss-owasp/layouts/partials/page.html
@@ -1,12 +1,7 @@
 <div class="container" role="main">
   <div class="row">
     <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1">
-      {{ .Content }}
-      {{ if .Site.DisqusShortname }}
-        <div class="disqus-comments">
-        {{ template "_internal/disqus.html" . }}
-        </div>
-      {{ end }}
+      {{ .Content }}      
     </div>
   </div>
 </div>