diff --git a/.travis.yml b/.travis.yml
index 37b7b4d6639..4463accac3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,21 +10,11 @@ cache:
      - ~/docker
 
 before_install:
-  - if [[ -e ~/docker/postgresql.tar ]]; then docker load -i ~/docker/postgresql.tar; fi
-  - if [[ -e ~/docker/solr.tar ]]; then docker load -i ~/docker/solr.tar; fi
-  - if [[ -e ~/docker/redis.tar ]]; then docker load -i ~/docker/redis.tar; fi
-  - if [[ -e ~/docker/ckan.tar ]]; then docker load -i ~/docker/ckan.tar; fi
-
-  - docker build --rm=false -t postgresql ./contrib/docker/postgresql/
+  - docker build --rm=false -f contrib/docker/postgresql/Dockerfile -t postgresql .
   - docker build --rm=false -f contrib/docker/solr/Dockerfile -t solr .
   - docker pull redis:latest
   - docker build --rm=false -t ckan .
 
-  - mkdir -p ~/docker; docker save postgresql > ~/docker/postgresql.tar
-  - mkdir -p ~/docker; docker save solr > ~/docker/solr.tar
-  - mkdir -p ~/docker; docker save redis:latest > ~/docker/redis.tar
-  - mkdir -p ~/docker; docker save ckan > ~/docker/ckan.tar
-
 install:
   - docker run -d --name db postgresql
   - docker run -d --name solr solr
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
index fc5991811da..f68d23e3f68 100644
--- a/contrib/docker/docker-compose.yml
+++ b/contrib/docker/docker-compose.yml
@@ -47,7 +47,8 @@ services:
   db:
     container_name: db
     build:
-      context: postgresql/
+      context: ../../
+      dockerfile: contrib/docker/postgresql/Dockerfile
       args:
         - DS_RO_PASS=${DATASTORE_READONLY_PASSWORD}
         - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
diff --git a/contrib/docker/postgresql/Dockerfile b/contrib/docker/postgresql/Dockerfile
index 53e6a9bd04b..82d96fd9b5e 100644
--- a/contrib/docker/postgresql/Dockerfile
+++ b/contrib/docker/postgresql/Dockerfile
@@ -12,6 +12,4 @@ ARG POSTGRES_PASSWORD
 ARG DS_RO_PASS
 
 # Include datastore setup scripts
-ADD /docker-entrypoint-initdb.d/00_create_datastore.sql /docker-entrypoint-initdb.d/00_create_datastore.sql
-ADD /docker-entrypoint-initdb.d/20_postgis_permissions.sql /docker-entrypoint-initdb.d/20_postgis_permissions.sql
-
+ADD ./contrib/docker/postgresql/docker-entrypoint-initdb.d /docker-entrypoint-initdb.d