diff --git a/Dockerfile b/Dockerfile
index 84c831b066b..f33fcc2f6a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,6 +53,8 @@ ADD ./contrib/docker/my_init.d /etc/my_init.d
 ADD ./contrib/docker/svc /etc/service
 CMD ["/sbin/my_init"]
 
+# Volumes
+VOLUME ["/etc/ckan/default"]
 VOLUME ["/var/lib/ckan"]
 EXPOSE 80
 
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
new file mode 100644
index 00000000000..01ecd5aa681
--- /dev/null
+++ b/contrib/docker/docker-compose.yml
@@ -0,0 +1,11 @@
+ckan:
+  image: 'ckan/ckan:latest'
+  links:
+    - db
+    - solr
+  ports:
+    - '80:80'
+db:
+  image: 'ckan/postgresql:latest'
+solr:
+  image: 'ckan/solr:latest'
diff --git a/contrib/docker/my_init.d/50_configure b/contrib/docker/my_init.d/50_configure
index af353731fa3..d23abe94f51 100755
--- a/contrib/docker/my_init.d/50_configure
+++ b/contrib/docker/my_init.d/50_configure
@@ -34,9 +34,9 @@ write_config () {
 }
 
 link_postgres_url () {
-  local user=$DB_ENV_POSTGRESQL_USER
-  local pass=$DB_ENV_POSTGRESQL_PASS
-  local db=$DB_ENV_POSTGRESQL_DB
+  local user=$DB_ENV_POSTGRES_USER
+  local pass=$DB_ENV_POSTGRES_PASS
+  local db=$DB_ENV_POSTGRES_DB
   local host=$DB_PORT_5432_TCP_ADDR
   local port=$DB_PORT_5432_TCP_PORT
   echo "postgresql://${user}:${pass}@${host}:${port}/${db}"
diff --git a/contrib/docker/postgresql/Dockerfile b/contrib/docker/postgresql/Dockerfile
index 07af96a8e6c..2fd05ef813d 100644
--- a/contrib/docker/postgresql/Dockerfile
+++ b/contrib/docker/postgresql/Dockerfile
@@ -1,6 +1,7 @@
-FROM orchardup/postgresql
+FROM postgres:latest
+MAINTAINER Open Knowledge
 
 # Customize default user/pass/db
-ENV POSTGRESQL_USER ckan
-ENV POSTGRESQL_PASS ckan
-ENV POSTGRESQL_DB ckan
+ENV POSTGRES_USER ckan
+ENV POSTGRES_PASS ckan
+ENV POSTGRES_DB ckan
diff --git a/contrib/docker/solr/Dockerfile b/contrib/docker/solr/Dockerfile
index 56749b5085c..b702fd72523 100644
--- a/contrib/docker/solr/Dockerfile
+++ b/contrib/docker/solr/Dockerfile
@@ -8,16 +8,16 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -q -y install default-jre-headless
 # Install Solr
 ENV SOLR_HOME /opt/solr/example/solr
 ENV SOLR_VERSION 4.8.1
-ENV SOLR solr-$SOLR_VERSION
+
 RUN mkdir -p /opt/solr
-ADD https://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/$SOLR.tgz /opt/$SOLR.tgz
-RUN tar zxf /opt/$SOLR.tgz -C /opt/solr --strip-components 1
+ADD https://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz /opt/solr-$SOLR_VERSION.tgz
+RUN tar zxf /opt/solr-$SOLR_VERSION.tgz -C /opt/solr --strip-components 1
 
 # Install CKAN Solr core
 RUN cp -R $SOLR_HOME/collection1/ $SOLR_HOME/ckan/
 RUN echo name=ckan > $SOLR_HOME/ckan/core.properties
-ADD schema.xml $SOLR_HOME/ckan/conf/schema.xml
+ADD https://raw.githubusercontent.com/ckan/ckan/master/ckan/config/solr/schema.xml $SOLR_HOME/ckan/conf/schema.xml
 
 EXPOSE 8983
 WORKDIR /opt/solr/example
-CMD ["java", "-jar", "start.jar"]
+CMD ["java", "-jar", "start.jar"]
\ No newline at end of file
diff --git a/contrib/docker/solr/schema.xml b/contrib/docker/solr/schema.xml
deleted file mode 120000
index cf2fffa39ba..00000000000
--- a/contrib/docker/solr/schema.xml
+++ /dev/null
@@ -1 +0,0 @@
-../../../ckan/config/solr/schema.xml
\ No newline at end of file