diff --git a/docker/distro_release/Dockerfile.centos6 b/docker/distro_release/Dockerfile.centos6
index 07ebc5f99..8de92e0f6 100644
--- a/docker/distro_release/Dockerfile.centos6
+++ b/docker/distro_release/Dockerfile.centos6
@@ -1,13 +1,14 @@
+## Centos 6 missing ghc 8.4.4 support, see https://github.com/commercialhaskell/stack/issues/4161
 FROM centos:centos6
 
 RUN yum -y update
 RUN yum -y install perl make automake gcc gmp-devel libffi zlib zlib-devel xz tar
-RUN yum -y install https://download.postgresql.org/pub/repos/yum/9.3/redhat/rhel-6-x86_64/pgdg-centos93-9.3-2.noarch.rpm
-RUN yum -y install postgresql93-devel
+RUN yum -y install https://download.postgresql.org/pub/repos/yum/10/redhat/rhel-6-x86_64/pgdg-centos10-10-2.noarch.rpm
+RUN yum -y install postgresql10-devel
 RUN yum clean all
 RUN curl -sSL https://get.haskellstack.org/ | sh
 
-ENV PATH $PATH:/usr/pgsql-9.3/bin
+ENV PATH $PATH:/usr/pgsql-10/bin
 
 # To disable warning when building
 ENV PATH $PATH:/root/.local/bin
diff --git a/docker/distro_release/Dockerfile.centos7 b/docker/distro_release/Dockerfile.centos7
index 15d035064..fb38f3754 100644
--- a/docker/distro_release/Dockerfile.centos7
+++ b/docker/distro_release/Dockerfile.centos7
@@ -2,12 +2,12 @@ FROM centos:centos7
 
 RUN yum -y update
 RUN yum -y install perl make automake gcc gmp-devel libffi zlib zlib-devel xz tar
-RUN yum -y install yum install https://download.postgresql.org/pub/repos/yum/9.3/redhat/rhel-7-x86_64/pgdg-centos93-9.3-2.noarch.rpm
-RUN yum -y install postgresql93-devel
+RUN yum -y install yum install https://download.postgresql.org/pub/repos/yum/10/redhat/rhel-7-x86_64/pgdg-centos10-10-2.noarch.rpm
+RUN yum -y install postgresql10-devel
 RUN yum clean all
 RUN curl -sSL https://get.haskellstack.org/ | sh
 
-ENV PATH $PATH:/usr/pgsql-9.3/bin
+ENV PATH $PATH:/usr/pgsql-10/bin
 
 # To disable warning when building
 ENV PATH $PATH:/root/.local/bin
diff --git a/docker/distro_release/Dockerfile.ubuntu b/docker/distro_release/Dockerfile.ubuntu
index 664848128..6a07aef5a 100644
--- a/docker/distro_release/Dockerfile.ubuntu
+++ b/docker/distro_release/Dockerfile.ubuntu
@@ -1,5 +1,7 @@
 FROM ubuntu:16.04
 
+## TODO pin the stack version
+#
 RUN BUILD_DEPS="curl ca-certificates build-essential" && \
     apt-get -qq update && \
     apt-get -qqy --no-install-recommends install \
diff --git a/docker/distro_release/Dockerfile.ubuntui386 b/docker/distro_release/Dockerfile.ubuntui386
index c9181c548..4b601e3fa 100644
--- a/docker/distro_release/Dockerfile.ubuntui386
+++ b/docker/distro_release/Dockerfile.ubuntui386
@@ -1,4 +1,6 @@
-FROM 32bit/ubuntu:16.04
+FROM i386/ubuntu:16.04
+
+## TODO pin the stack version
 
 RUN BUILD_DEPS="curl ca-certificates build-essential" && \
     apt-get -qq update && \