diff --git a/9.6/Dockerfile b/9.6/Dockerfile
index c20ea32804..de1ad5a7d6 100644
--- a/9.6/Dockerfile
+++ b/9.6/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM debian:jessie
+FROM debian:stretch
 
 RUN set -ex; \
 	if ! command -v gpg > /dev/null; then \
@@ -8,6 +8,7 @@ RUN set -ex; \
 			gnupg2 \
 			dirmngr \
 		; \
+                apt-get dist-upgrade -y --no-install-recommends; \
 		rm -rf /var/lib/apt/lists/*; \
 	fi
 
@@ -26,7 +27,7 @@ RUN set -x \
 	&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
 	&& chmod +x /usr/local/bin/gosu \
 	&& gosu nobody true \
-	&& apt-get purge -y --auto-remove ca-certificates wget
+	&& apt-get purge -y --auto-remove ca-certificates
 
 # make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default
 RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \
@@ -47,7 +48,7 @@ RUN set -ex; \
 	apt-key list
 
 ENV PG_MAJOR 9.6
-ENV PG_VERSION 9.6.5-1.pgdg80+1
+ENV PG_VERSION 9.6.5-1.pgdg90+1
 
 RUN set -ex; \
 	\
@@ -55,13 +56,13 @@ RUN set -ex; \
 	case "$dpkgArch" in \
 		amd64|i386|ppc64el) \
 # arches officialy built by upstream
-			echo "deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			apt-get update; \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from their published source packages
-			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
+			echo "deb-src http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main $PG_MAJOR" > /etc/apt/sources.list.d/pgdg.list; \
 			\
 			tempDir="$(mktemp -d)"; \
 			cd "$tempDir"; \
@@ -103,7 +104,13 @@ RUN set -ex; \
 	sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf; \
 	apt-get install -y \
 		"postgresql-$PG_MAJOR=$PG_VERSION" \
+		"postgresql-client-$PG_MAJOR=$PG_VERSION" \
 		"postgresql-contrib-$PG_MAJOR=$PG_VERSION" \
+                "postgresql-server-dev-$PG_MAJOR=$PG_VERSION" \
+                "postgresql-$PG_MAJOR-repmgr" \
+                "barman-cli" \
+                "python-setuptools" "python3" "python3-setuptools" "libmagickwand-dev" \
+                "rsync" "openssh-client" \
 	; \
 	\
 	rm -rf /var/lib/apt/lists/*; \
diff --git a/9.6/docker-entrypoint.sh b/9.6/docker-entrypoint.sh
index c96fea538d..31227fb90a 100755
--- a/9.6/docker-entrypoint.sh
+++ b/9.6/docker-entrypoint.sh
@@ -73,7 +73,7 @@ if [ "$1" = 'postgres' ]; then
 				WARNING: No password has been set for the database.
 				         This will allow anyone with access to the
 				         Postgres port to access your database. In
-				         Docker's default configuration, this is
+				         Docker''s default configuration, this is
 				         effectively any other container on the same
 				         system.