diff --git a/8.4/Dockerfile b/8.4/Dockerfile
index 9eb88d81de..d66ee513d4 100644
--- a/8.4/Dockerfile
+++ b/8.4/Dockerfile
@@ -22,6 +22,8 @@ RUN apt-get update \
 		postgresql-$PG_MAJOR=$PG_VERSION \
 		postgresql-contrib-$PG_MAJOR=$PG_VERSION
 
+RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
+
 ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
 ENV PGDATA /var/lib/postgresql/data
 VOLUME /var/lib/postgresql/data
diff --git a/9.0/Dockerfile b/9.0/Dockerfile
index bf7e2fb50c..c2c58092b0 100644
--- a/9.0/Dockerfile
+++ b/9.0/Dockerfile
@@ -22,6 +22,8 @@ RUN apt-get update \
 		postgresql-$PG_MAJOR=$PG_VERSION \
 		postgresql-contrib-$PG_MAJOR=$PG_VERSION
 
+RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
+
 ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
 ENV PGDATA /var/lib/postgresql/data
 VOLUME /var/lib/postgresql/data
diff --git a/9.1/Dockerfile b/9.1/Dockerfile
index 9739a5686f..98b6fb38ab 100644
--- a/9.1/Dockerfile
+++ b/9.1/Dockerfile
@@ -22,6 +22,8 @@ RUN apt-get update \
 		postgresql-$PG_MAJOR=$PG_VERSION \
 		postgresql-contrib-$PG_MAJOR=$PG_VERSION
 
+RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
+
 ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
 ENV PGDATA /var/lib/postgresql/data
 VOLUME /var/lib/postgresql/data
diff --git a/9.2/Dockerfile b/9.2/Dockerfile
index 1ddb5f5272..f63740e717 100644
--- a/9.2/Dockerfile
+++ b/9.2/Dockerfile
@@ -22,6 +22,8 @@ RUN apt-get update \
 		postgresql-$PG_MAJOR=$PG_VERSION \
 		postgresql-contrib-$PG_MAJOR=$PG_VERSION
 
+RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
+
 ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
 ENV PGDATA /var/lib/postgresql/data
 VOLUME /var/lib/postgresql/data
diff --git a/9.3/Dockerfile b/9.3/Dockerfile
index 90a6f347be..b6efd2c074 100644
--- a/9.3/Dockerfile
+++ b/9.3/Dockerfile
@@ -22,6 +22,8 @@ RUN apt-get update \
 		postgresql-$PG_MAJOR=$PG_VERSION \
 		postgresql-contrib-$PG_MAJOR=$PG_VERSION
 
+RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
+
 ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
 ENV PGDATA /var/lib/postgresql/data
 VOLUME /var/lib/postgresql/data
diff --git a/9.4/Dockerfile b/9.4/Dockerfile
index 04eb6b0f3d..9a61536bc1 100644
--- a/9.4/Dockerfile
+++ b/9.4/Dockerfile
@@ -22,6 +22,8 @@ RUN apt-get update \
 		postgresql-$PG_MAJOR=$PG_VERSION \
 		postgresql-contrib-$PG_MAJOR=$PG_VERSION
 
+RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
+
 ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
 ENV PGDATA /var/lib/postgresql/data
 VOLUME /var/lib/postgresql/data
diff --git a/Dockerfile.template b/Dockerfile.template
index 02e8f02a2d..3da1d6e1af 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -23,6 +23,8 @@ RUN apt-get update \
 		postgresql-$PG_MAJOR=$PG_VERSION \
 		postgresql-contrib-$PG_MAJOR=$PG_VERSION
 
+RUN mkdir -p /var/run/postgresql && chown -R postgres /var/run/postgresql
+
 ENV PATH /usr/lib/postgresql/$PG_MAJOR/bin:$PATH
 ENV PGDATA /var/lib/postgresql/data
 VOLUME /var/lib/postgresql/data