diff --git a/9.2/alpine/Dockerfile b/9.2/alpine/Dockerfile
index 0a0748b8ff..dc54d353cf 100644
--- a/9.2/alpine/Dockerfile
+++ b/9.2/alpine/Dockerfile
@@ -98,8 +98,9 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-# tzdata loading functionality is optional, and fails gracefully
-#		tzdata \
+# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
+# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
+		tzdata \
 	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
diff --git a/9.3/alpine/Dockerfile b/9.3/alpine/Dockerfile
index e4a08ac456..6e9886d9d3 100644
--- a/9.3/alpine/Dockerfile
+++ b/9.3/alpine/Dockerfile
@@ -98,8 +98,9 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-# tzdata loading functionality is optional, and fails gracefully
-#		tzdata \
+# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
+# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
+		tzdata \
 	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile
index 8192dbfb1d..7801d68746 100644
--- a/9.4/alpine/Dockerfile
+++ b/9.4/alpine/Dockerfile
@@ -98,8 +98,9 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-# tzdata loading functionality is optional, and fails gracefully
-#		tzdata \
+# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
+# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
+		tzdata \
 	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile
index f6b88470ff..6e8b1497e1 100644
--- a/9.5/alpine/Dockerfile
+++ b/9.5/alpine/Dockerfile
@@ -98,8 +98,9 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-# tzdata loading functionality is optional, and fails gracefully
-#		tzdata \
+# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
+# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
+		tzdata \
 	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile
index d7a45299bc..b918a72403 100644
--- a/9.6/alpine/Dockerfile
+++ b/9.6/alpine/Dockerfile
@@ -98,8 +98,9 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-# tzdata loading functionality is optional, and fails gracefully
-#		tzdata \
+# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
+# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
+		tzdata \
 	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index c51348bf70..b012b7b560 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -98,8 +98,9 @@ RUN set -ex \
 		$runDeps \
 		bash \
 		su-exec \
-# tzdata loading functionality is optional, and fails gracefully
-#		tzdata \
+# tzdata is optional, but only adds around 1Mb to image size and is recommended by Django documentation:
+# https://docs.djangoproject.com/en/1.10/ref/databases/#optimizing-postgresql-s-configuration
+		tzdata \
 	&& apk del .fetch-deps .build-deps \
 	&& cd / \
 	&& rm -rf \