diff --git a/etc/dockerfiles/stack-build/README.md b/etc/dockerfiles/stack-build/README.md
index 9fb1ec3d80..1addb0dda0 100644
--- a/etc/dockerfiles/stack-build/README.md
+++ b/etc/dockerfiles/stack-build/README.md
@@ -1,7 +1,7 @@
 dockerfiles/stack-build
 =======================
 
-Build [fpco/stack-build](https://hub.docker.com/r/fpco/stack-build/) Docker
+Build [cryptact/stack-build](https://hub.docker.com/r/cryptact/stack-build/) and [cryptact/stack-build-small](https://hub.docker.com/r/cryptact/stack-build-small/) Docker
 images. This script and its Dockerfiles are used for building images for LTS >=
 8.0.
 
diff --git a/etc/dockerfiles/stack-build/build.sh b/etc/dockerfiles/stack-build/build.sh
index 7a93a716f1..a33f08ea48 100755
--- a/etc/dockerfiles/stack-build/build.sh
+++ b/etc/dockerfiles/stack-build/build.sh
@@ -7,7 +7,7 @@ cd "$(dirname "$0")"
 # Constants and defaults
 #
 
-DOCKER_REPO=fpco/stack-build
+DOCKER_REPO=cryptact/stack-build
 PUSH=false
 DRY=false
 VARIANT=build
@@ -61,7 +61,7 @@ while [[ $# -gt 0 ]]; do
             ;;
         --small)
             VARIANT=small
-            DOCKER_REPO=fpco/stack-build-small
+            DOCKER_REPO=cryptact/stack-build-small
             shift
             ;;
         -*)
diff --git a/etc/dockerfiles/stack-build/lts-13.20/Dockerfile b/etc/dockerfiles/stack-build/lts-13.20/Dockerfile
index 0ac78fcbbe..a39ca55c34 100644
--- a/etc/dockerfiles/stack-build/lts-13.20/Dockerfile
+++ b/etc/dockerfiles/stack-build/lts-13.20/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER Emanuel Borsboom <manny@fpcomplete.com>
 
@@ -27,10 +27,10 @@ ENV LANG=C.UTF-8 \
 #
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends wget netbase ca-certificates && \
+    apt-get install -y --no-install-recommends wget netbase ca-certificates gnupg2 && \
     if [ "$VARIANT" = "small" ]; then \
-        echo "deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main" >>/etc/apt/sources.list && \
-        echo "deb-src http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main" >>/etc/apt/sources.list && \
+        echo "deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main" >>/etc/apt/sources.list && \
+        echo "deb-src http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main" >>/etc/apt/sources.list && \
         apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 063DAB2BDC0B3F9FCEBC378BFF3AEACEF6F88286 && \
         apt-get update && \
 	    apt-get install -y --no-install-recommends \