diff --git a/8.4/Dockerfile b/8.4/Dockerfile
index 49c815761c..2d419c2442 100644
--- a/8.4/Dockerfile
+++ b/8.4/Dockerfile
@@ -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
diff --git a/9.0/Dockerfile b/9.0/Dockerfile
index 7a1040659c..b4efa30107 100644
--- a/9.0/Dockerfile
+++ b/9.0/Dockerfile
@@ -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
diff --git a/9.1/Dockerfile b/9.1/Dockerfile
index a7985b87f5..d58f8be5f8 100644
--- a/9.1/Dockerfile
+++ b/9.1/Dockerfile
@@ -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
diff --git a/9.2/Dockerfile b/9.2/Dockerfile
index aef56e5b3f..6a91f83788 100644
--- a/9.2/Dockerfile
+++ b/9.2/Dockerfile
@@ -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
diff --git a/9.3/Dockerfile b/9.3/Dockerfile
index 827805b323..4f52e969e4 100644
--- a/9.3/Dockerfile
+++ b/9.3/Dockerfile
@@ -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
diff --git a/9.4/Dockerfile b/9.4/Dockerfile
index 4d8cb047d4..152229e671 100644
--- a/9.4/Dockerfile
+++ b/9.4/Dockerfile
@@ -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
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