diff --git a/10/Dockerfile b/10/Dockerfile
index fea6ac6993..c6191ef0a8 100644
--- a/10/Dockerfile
+++ b/10/Dockerfile
@@ -49,7 +49,7 @@ RUN set -ex; \
 ENV PG_MAJOR 10
 ENV PG_VERSION 10~beta1-1.pgdg90+1
 
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list
 
 RUN apt-get update \
 	&& apt-get install -y postgresql-common \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 4c44d4d485..50f45ff119 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -49,7 +49,7 @@ RUN set -ex; \
 ENV PG_MAJOR %%PG_MAJOR%%
 ENV PG_VERSION %%PG_VERSION%%
 
-RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list
+RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ %%DEBIAN_SUITE%%-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list
 
 RUN apt-get update \
 	&& apt-get install -y postgresql-common \