diff --git a/Dockerfile.db b/Dockerfile.db
index 649f907669..489c073455 100644
--- a/Dockerfile.db
+++ b/Dockerfile.db
@@ -1,3 +1,3 @@
-FROM mdillon/postgis:10
+FROM postgis/postgis:10-2.5-alpine
 
-ADD ./scripts/tune-postgis.sh /docker-entrypoint-initdb.d
+COPY ./scripts/tune-postgis.sh /docker-entrypoint-initdb.d/tune-postgis.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 0ebe675817..60a2d09fea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,6 +22,7 @@ services:
     ports:
       - "127.0.0.1:5432:5432"
     environment:
+      - POSTGRES_HOST_AUTH_METHOD=trust
       - PG_WORK_MEM
       - PG_MAINTENANCE_WORK_MEM
   import:
diff --git a/scripts/tune-postgis.sh b/scripts/tune-postgis.sh
index e027052c2d..2c9745472c 100644
--- a/scripts/tune-postgis.sh
+++ b/scripts/tune-postgis.sh
@@ -3,5 +3,5 @@
 set -e
 export PGUSER="$POSTGRES_USER"
 
-"${psql[@]}" -c "ALTER SYSTEM SET work_mem='${PG_WORK_MEM:-16MB}';"
-"${psql[@]}" -c "ALTER SYSTEM SET maintenance_work_mem='${PG_MAINTENANCE_WORK_MEM:-256MB}';"
+psql -c "ALTER SYSTEM SET work_mem='${PG_WORK_MEM:-16MB}';"
+psql -c "ALTER SYSTEM SET maintenance_work_mem='${PG_MAINTENANCE_WORK_MEM:-256MB}';"