diff --git a/Dockerfile b/Dockerfile
index a2250b8497..6674f6b355 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,9 +24,7 @@ ARG ENABLE_ARCHIVES=true
 ###
 # Set up base stages for building and deploying
 ###
-
-# Get basic configs and Jekyll env
-FROM docs/docker.github.io:docs-builder AS builderbase
+FROM starefossen/github-pages:198 AS builderbase
 ENV TARGET=/usr/share/nginx/html
 WORKDIR /usr/src/app/md_source/
 
diff --git a/Gemfile b/Gemfile
index f6e2dd018e..f5ffef68d3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,5 +39,5 @@ source "https://rubygems.org"
 # live site deploy, which uses the Dockerfiles found in the publish-tools
 # branch.
 
-gem "github-pages", "177"
+gem "github-pages", "198"
 gem 'wdm' if Gem.win_platform?