diff --git a/ci/images/google-geode-builder/scripts/setup.sh b/ci/images/google-geode-builder/scripts/setup.sh
index 78b0f47..1aca957 100755
--- a/ci/images/google-geode-builder/scripts/setup.sh
+++ b/ci/images/google-geode-builder/scripts/setup.sh
@@ -40,7 +40,9 @@
     ca-certificates \
     cgroupfs-mount \
     docker-compose \
-    docker-ce \
+    containerd.io \
+    docker-ce="5:19.03.14~3-0~ubuntu-focal" \
+    docker-ce-cli="5:19.03.14~3-0~ubuntu-focal" \
     git \
     google-chrome-stable \
     htop \
diff --git a/ci/pipelines/images/deploy_images_pipeline.sh b/ci/pipelines/images/deploy_images_pipeline.sh
index a6f5c4d..3ee1327 100755
--- a/ci/pipelines/images/deploy_images_pipeline.sh
+++ b/ci/pipelines/images/deploy_images_pipeline.sh
@@ -72,7 +72,7 @@
 public-pipelines: ${PUBLIC_PIPELINES}
 gcp-project: ${GCP_PROJECT}
 windows-base-family: windows-2016
-linux-base-family: ubuntu-minimal-1804-lts
+linux-base-family: ubuntu-minimal-2004-lts
 YML