diff --git a/Dockerfile.custom b/Dockerfile.custom
index e3331a9..0e341dc 100644
--- a/Dockerfile.custom
+++ b/Dockerfile.custom
@@ -38,10 +38,8 @@ ARG GOLANG_DOWNLOAD_SHA256
 RUN if [ -n "$INSTALL_GOLANG_VERSION" ] ; then /scripts/install-golang "${INSTALL_GOLANG_VERSION}" "${GOLANG_DOWNLOAD_SHA256}" && go version; fi
 
 # Postgres
-# Codedebt: currently this will only install the default version of postgres,
-# not the stipulated version
 ARG POSTGRES_VERSION
-RUN if [ -n "$POSTGRES_VERSION" ] ; then /scripts/install-postgresql; fi
+RUN if [ -n "$POSTGRES_VERSION" ] ; then /scripts/install-postgresql $POSTGRES_VERSION; fi
 
 # Ansible
 ARG ANSIBLE_VERSION
diff --git a/scripts/install-postgresql b/scripts/install-postgresql
index 826edad..939715c 100755
--- a/scripts/install-postgresql
+++ b/scripts/install-postgresql
@@ -2,10 +2,11 @@
 set -xeuo pipefail
 IFS=$'\n\t'
 
+POSTGRES_VERSION=${1:-9.6}
 export DEBIAN_FRONTEND=noninteractive
 
 curl -sS -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
-echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" | tee /etc/apt/sources.list.d/postgresql.list
+echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg ${POSTGRES_VERSION}" | tee /etc/apt/sources.list.d/postgresql.list
 
 apt-get update
 apt-get install -y postgresql-client
diff --git a/scripts/install-www-gitlab-com b/scripts/install-www-gitlab-com
index cea7788..7662d55 100755
--- a/scripts/install-www-gitlab-com
+++ b/scripts/install-www-gitlab-com
@@ -9,7 +9,7 @@ apt-get update
 apt-get install -yq --no-install-recommends \
   make gcc g++ locales \
   git-core pandoc texlive-latex-recommended texlive-xetex \
-  texlive-fonts-recommended lmodern ed file curl
+  texlive-fonts-recommended lmodern ed file curl gnupg2
 
 apt-get autoremove -yq