diff --git a/docs/Gemfile b/docs/Gemfile
index 1066d4172..dfbbd46b5 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -27,5 +27,3 @@ gem "wdm", "~> 0.1.1", :install_if => Gem.win_platform?
 # kramdown v2 ships without the gfm parser by default. If you're using
 # kramdown v1, comment out this line.
 #gem "kramdown-parser-gfm"
-
-gem "jekyll-rtd-theme", "~> 2.0.6"
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index 4f835da64..86d5ae891 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -137,8 +137,6 @@ GEM
       addressable (~> 2.0)
       jekyll (>= 3.5, < 5.0)
       rubyzip (>= 1.3.0)
-    jekyll-rtd-theme (2.0.7)
-      github-pages (~> 207)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-seo-tag (2.6.1)
@@ -259,7 +257,6 @@ PLATFORMS
 DEPENDENCIES
   github-pages (~> 207)
   jekyll (~> 3.9.0)
-  jekyll-rtd-theme (~> 2.0.6)
   tzinfo (~> 1.2)
   tzinfo-data
   wdm (~> 0.1.1)
diff --git a/docs/_config.yml b/docs/_config.yml
index 58e799d1a..27a689eb0 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -26,7 +26,7 @@ markdown: kramdown
 kramdown:
   toc_levels: 1..3
 
-remote_theme: rundocs/jekyll-rtd-theme
+remote_theme: rundocs/jekyll-rtd-theme@v2.0.9
 
 # Exclude from processing.
 # The following items will not be processed, by default. Create a custom list
diff --git a/docs/_includes/class/addons-wrap.liquid b/docs/_includes/class/addons-wrap.liquid
index 81e032f7f..8385205dc 100644
--- a/docs/_includes/class/addons-wrap.liquid
+++ b/docs/_includes/class/addons-wrap.liquid
@@ -36,7 +36,7 @@
         </div>
     </div>
     <div class="addons d-flex flex-column height-full p-2 d-none">
-        {%- assign items = "github, analytics" | split: ", " -%}
+        {%- assign items = "github" | split: ", " -%}
         {% for item in items -%}
             {% include addons/{{ item }}.liquid %}
         {% endfor -%}
diff --git a/scripts/test-infra/build-gh-pages.sh b/scripts/test-infra/build-gh-pages.sh
index 33e55e5fb..c62571c8c 100755
--- a/scripts/test-infra/build-gh-pages.sh
+++ b/scripts/test-infra/build-gh-pages.sh
@@ -1,3 +1,11 @@
 #!/bin/bash -e
 
+# Pre-create output directory with all write access. The Jekyll docker image is
+# stupid enough to do all sorts of uid/gid/chown magic making build fail for
+# root user. In prow we run as root because of DIND.
+_outdir="docs/_site"
+mkdir -p "$_outdir"
+chmod a+rwx "$_outdir"
+
+# Build docs
 make site-build