diff --git a/server/config/db.env.example b/server/config/db.env.example
index a88f5a1f..16819a43 100644
--- a/server/config/db.env.example
+++ b/server/config/db.env.example
@@ -1,3 +1,5 @@
 POSTGRES_USER=tileserv
-POSTGRES_PASSWORD=tileserv
-POSTGRES_DB=tileserv
\ No newline at end of file
+POSTGRES_PASS=tileserv
+PGUSER=tileserv
+PGPASS=tileserv
+POSTGRES_DBNAME=tileserv
\ No newline at end of file
diff --git a/server/docker-compose.yml b/server/docker-compose.yml
index 96637546..9730b12c 100644
--- a/server/docker-compose.yml
+++ b/server/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     ports:
       - 7800:7800
   tileserv_db:
-    image: postgis/postgis:13-master
+    image: kartoza/postgis:13-3.1
     container_name: tileserv_db
     volumes:
       - ./data:/work
diff --git a/server/load-data.sh b/server/load-data.sh
index 084ccc76..e207ce8e 100755
--- a/server/load-data.sh
+++ b/server/load-data.sh
@@ -3,5 +3,5 @@ set -euo pipefail
 
 # Load Maryland geojson
 echo "Loading data..."
-docker-compose exec tileserv_db sh -c 'ogr2ogr -progress -f PostgreSQL PG:"dbname=tileserv user=tileserv" /work/maryland.geojson'
+docker-compose exec tileserv_db sh -c 'ogr2ogr -progress -f PostgreSQL PG:"dbname=tileserv user=tileserv" /work/maryland.geojson -nln maryland'
 echo "Data load complete"