diff --git a/9.2/alpine/Dockerfile b/9.2/alpine/Dockerfile
index 91ec7af7ee..0a0748b8ff 100644
--- a/9.2/alpine/Dockerfile
+++ b/9.2/alpine/Dockerfile
@@ -98,13 +98,18 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-	&& apk del .build-deps \
+# tzdata loading functionality is optional, and fails gracefully
+#		tzdata \
+	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
 		/usr/src/postgresql \
 		/usr/local/include/* \
 	&& find /usr/local -name '*.a' -delete
 
+# make the sample config easier to munge (and "correct by default")
+RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
+
 RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
 
 ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
diff --git a/9.3/alpine/Dockerfile b/9.3/alpine/Dockerfile
index e6058de586..e4a08ac456 100644
--- a/9.3/alpine/Dockerfile
+++ b/9.3/alpine/Dockerfile
@@ -98,13 +98,18 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-	&& apk del .build-deps \
+# tzdata loading functionality is optional, and fails gracefully
+#		tzdata \
+	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
 		/usr/src/postgresql \
 		/usr/local/include/* \
 	&& find /usr/local -name '*.a' -delete
 
+# make the sample config easier to munge (and "correct by default")
+RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
+
 RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
 
 ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile
index 1e0cf16b20..8192dbfb1d 100644
--- a/9.4/alpine/Dockerfile
+++ b/9.4/alpine/Dockerfile
@@ -98,13 +98,18 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-	&& apk del .build-deps \
+# tzdata loading functionality is optional, and fails gracefully
+#		tzdata \
+	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
 		/usr/src/postgresql \
 		/usr/local/include/* \
 	&& find /usr/local -name '*.a' -delete
 
+# make the sample config easier to munge (and "correct by default")
+RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
+
 RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
 
 ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile
index 7da24d8454..f6b88470ff 100644
--- a/9.5/alpine/Dockerfile
+++ b/9.5/alpine/Dockerfile
@@ -98,13 +98,18 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-	&& apk del .build-deps \
+# tzdata loading functionality is optional, and fails gracefully
+#		tzdata \
+	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
 		/usr/src/postgresql \
 		/usr/local/include/* \
 	&& find /usr/local -name '*.a' -delete
 
+# make the sample config easier to munge (and "correct by default")
+RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
+
 RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
 
 ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile
index 2c475da7a3..d7a45299bc 100644
--- a/9.6/alpine/Dockerfile
+++ b/9.6/alpine/Dockerfile
@@ -98,13 +98,18 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-	&& apk del .build-deps \
+# tzdata loading functionality is optional, and fails gracefully
+#		tzdata \
+	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
 		/usr/src/postgresql \
 		/usr/local/include/* \
 	&& find /usr/local -name '*.a' -delete
 
+# make the sample config easier to munge (and "correct by default")
+RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
+
 RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
 
 ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 2ba3a3870f..c51348bf70 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -98,13 +98,18 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-	&& apk del .build-deps \
+# tzdata loading functionality is optional, and fails gracefully
+#		tzdata \
+	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
 		/usr/src/postgresql \
 		/usr/local/include/* \
 	&& find /usr/local -name '*.a' -delete
 
+# make the sample config easier to munge (and "correct by default")
+RUN sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/local/share/postgresql/postgresql.conf.sample
+
 RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
 
 ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH