diff --git a/README.md b/README.md
index 9b2f1a6..7d7a182 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,11 @@ differentiates itself by:
 
 * provides ssl support out of the box
 * connections are restricted to the docker subnet
-* template_postgis database template is created for you
 * a default database 'gis' is created for you so you can use this container 'out of the
   box' when it runs with e.g. QGIS
 * replication support included
+* Ability to create multiple database when you spin the database.
+* Enable multiple extensions in the database when setting it up
 
 We will work to add more security features to this container in the future with 
 the aim of making a PostGIS image that is ready to be used in a production 
@@ -87,11 +88,12 @@ sudo docker run --name "postgis" -p 25432:5432 -d -t kartoza/postgis
 ## Environment variables
 
 You can also use the following environment variables to pass a 
-user name, password and/or default database name.
+user name, password and/or default database name(or multiple databases coma separated).
 
 * -e POSTGRES_USER=<PGUSER> 
 * -e POSTGRES_PASS=<PGPASSWORD>
 * -e POSTGRES_DBNAME=<PGDBNAME>
+* -e POSTGRES_MULTIPLE_EXTENSIONS=postgis,hstore,postgis_topology # You can pass as many extensions as you need.
 
 These will be used to create a new superuser with
 your preferred credentials. If these are not specified then the postgresql 
diff --git a/docker-compose.yml b/docker-compose.yml
index 09a3ab3..40f60e9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 # docker-compose build
 # docker-compose up -d web
-version: '2'
+version: '2.1'
 volumes:
   dbbackups:
   postgis-data:
@@ -8,21 +8,26 @@ volumes:
 services:
 
   db:
-    image: kartoza/postgis:10.0-2.4
+    image: kartoza/postgis:11.0-2.5
     volumes:
-      - 'postgis-data:/var/lib/postgresql'
-      - 'dbbackups:/backups'
+      - postgis-data:/var/lib/postgresql
+      - dbbackups:/backups
     environment:
+      # If you need to create multiple database you can add coma separated databases eg gis,data
       - POSTGRES_DB=gis
       - POSTGRES_USER=docker
       - POSTGRES_PASS=docker
       - ALLOW_IP_RANGE=0.0.0.0/0
+      # Add extensions you need to be enabled by default in the DB. Default are the three specified below
+      #- POSTGRES_MULTIPLE_EXTENSIONS=postgis,hstore,postgis_topology
     ports:
-      - 25432:5432
-    restart: unless-stopped
+      - 5434:5432
+    restart: on-failure
+    healthcheck:
+      test: "exit 0"
 
   dbbackups:
-    image: kartoza/pg-backup:10.0
+    image: kartoza/pg-backup:11.0
     hostname: pg-backups
     volumes:
       - dbbackups:/backups
@@ -35,4 +40,7 @@ services:
       - PGDATABASE=gis
       - PGPORT=5432
       - PGHOST=db
-    restart: unless-stopped
+    restart: on-failure
+    depends_on:
+      db:
+        condition: service_healthy
diff --git a/env-data.sh b/env-data.sh
index be1731b..f2e8bc3 100644
--- a/env-data.sh
+++ b/env-data.sh
@@ -44,16 +44,19 @@ if [ -z "${DESTROY_DATABASE_ON_RESTART}" ]; then
 	DESTROY_DATABASE_ON_RESTART=true
 fi
 if [ -z "${PG_MAX_WAL_SENDERS}" ]; then
-	PG_MAX_WAL_SENDERS=8
+	PG_MAX_WAL_SENDERS=10
 fi
 if [ -z "${PG_WAL_KEEP_SEGMENTS}" ]; then
-	PG_WAL_KEEP_SEGMENTS=100
+	PG_WAL_KEEP_SEGMENTS=250
 fi
 
 if [ -z "${IP_LIST}" ]; then
 	IP_LIST='*'
 fi
 
+if [ -z "${POSTGRES_MULTIPLE_EXTENSIONS}" ]; then
+  POSTGRES_MULTIPLE_EXTENSIONS='postgis,hstore,postgis_topology'
+fi
 # Compatibility with official postgres variable
 # Official postgres variable gets priority
 if [ ! -z "${POSTGRES_PASSWORD}" ]; then
diff --git a/sample/replication/docker-compose.yml b/sample/replication/docker-compose.yml
index b424b7e..08c94f9 100644
--- a/sample/replication/docker-compose.yml
+++ b/sample/replication/docker-compose.yml
@@ -24,6 +24,9 @@ services:
       # We can specify optional credentials
       POSTGRES_USER: 'docker'
       POSTGRES_PASS: 'docker'
+      # Setup master replication variables
+      #PG_MAX_WAL_SENDERS: 8
+      #PG_WAL_KEEP_SEGMENTS: 100
     # You can expose the port to observe it in your local machine
     ports:
       - "7777:5432"
diff --git a/setup-conf.sh b/setup-conf.sh
index 6de4912..73034f3 100644
--- a/setup-conf.sh
+++ b/setup-conf.sh
@@ -15,21 +15,21 @@ cat $CONF.template > $CONF
 # This script will setup necessary configuration to optimise for PostGIS and to enable replications
 cat >> $CONF <<EOF
 wal_level = hot_standby
-max_wal_senders = $PG_MAX_WAL_SENDERS
-wal_keep_segments = $PG_WAL_KEEP_SEGMENTS
+max_wal_senders = ${PG_MAX_WAL_SENDERS}
+wal_keep_segments = ${PG_WAL_KEEP_SEGMENTS}
+superuser_reserved_connections= 10
+max_wal_size= 2GB
+wal_keep_segments= 64
 hot_standby = on
 listen_addresses = '${IP_LIST}'
 shared_buffers = 500MB
 work_mem = 16MB
 maintenance_work_mem = 128MB
 wal_buffers = 1MB
-# uncomment checkpoint_segments below if postgresql <= 9.4
-# checkpoint_segments = 6
 random_page_cost = 2.0
 xmloption = 'document'
 #archive_mode=on
 #archive_command = 'test ! -f ${WAL_ARCHIVE}/%f && cp -r %p ${WAL_ARCHIVE}/%f'
-#user-settings
 EOF
 
 # Optimise PostgreSQL shared memory for PostGIS
diff --git a/setup-database.sh b/setup-database.sh
index 13abc1d..5b7404e 100644
--- a/setup-database.sh
+++ b/setup-database.sh
@@ -6,8 +6,8 @@ source /env-data.sh
 
 # test if DATADIR is existent
 if [[ ! -d ${DATADIR} ]]; then
-	echo "Creating Postgres data at ${DATADIR}"
-	mkdir -p ${DATADIR}
+  echo "Creating Postgres data at ${DATADIR}"
+  mkdir -p ${DATADIR}
 fi
 
 
@@ -18,12 +18,12 @@ chown -R postgres:postgres ${DATADIR}
 
 # test if DATADIR has content
 if [[ ! "$(ls -A ${DATADIR})" ]]; then
-	# No content yet - first time pg is being run!
-	# No Replicate From settings. Assume that this is a master database.
-	# Initialise db
-	echo "Initializing Postgres Database at ${DATADIR}"
-	#chown -R postgres $DATADIR
-	su - postgres -c "$INITDB ${DATADIR}"
+  # No content yet - first time pg is being run!
+  # No Replicate From settings. Assume that this is a master database.
+  # Initialise db
+  echo "Initializing Postgres Database at ${DATADIR}"
+  #chown -R postgres $DATADIR
+  su - postgres -c "$INITDB ${DATADIR}"
 fi
 
 # test database existing
@@ -35,67 +35,34 @@ su - postgres -c "${POSTGRES} -D ${DATADIR} -c config_file=${CONF} ${LOCALONLY}
 
 # wait for postgres to come up
 until su - postgres -c "psql -l"; do
-	sleep 1
+  sleep 1
 done
 echo "postgres ready"
 
-
-RESULT=`su - postgres -c "psql -l | grep -w template_postgis | wc -l"`
-if [[ ${RESULT} == '1' ]]
-then
-	echo 'Postgis Already There'
-
-	if [[ ${HSTORE} == "true" ]]; then
-		echo 'HSTORE is only useful when you create the postgis database.'
-	fi
-	if [[ ${TOPOLOGY} == "true" ]]; then
-		echo 'TOPOLOGY is only useful when you create the postgis database.'
-	fi
-else
-	echo "Postgis is missing, installing now"
-	# Note the dockerfile must have put the postgis.sql and spatialrefsys.sql scripts into /root/
-	# We use template0 since we want different encoding to template1
-	echo "Creating template postgis"
-	su - postgres -c "createdb template_postgis -E UTF8 -T template0"
-	echo "Enabling template_postgis as a template"
-	CMD="UPDATE pg_database SET datistemplate = TRUE WHERE datname = 'template_postgis';"
-	su - postgres -c "psql -c \"$CMD\""
-	echo "Loading postgis extension"
-	su - postgres -c "psql template_postgis -c 'CREATE EXTENSION postgis;'"
-
-	if [[ ${HSTORE} == "true" ]]
-	then
-		echo "Enabling hstore in the template"
-		su - postgres -c "psql template_postgis -c 'CREATE EXTENSION hstore;'"
-	fi
-	if [[ ${TOPOLOGY} == "true" ]]
-	then
-		echo "Enabling topology in the template"
-		su - postgres -c "psql template_postgis -c 'CREATE EXTENSION postgis_topology;'"
-	fi
-
-	# Needed when importing old dumps using e.g ndims for constraints
-	# Ignore error if it doesn't exists
-	echo "Loading legacy sql"
-	su - postgres -c "psql template_postgis -f ${SQLDIR}/legacy_minimal.sql" || true
-	su - postgres -c "psql template_postgis -f ${SQLDIR}/legacy_gist.sql" || true
-fi
-
 # Setup user
 source /setup-user.sh
 
 
 # Create a default db called 'gis' or $POSTGRES_DBNAME that you can use to get up and running quickly
 # It will be owned by the docker db user
+# Since we now pass a comma separated list in database creation we need to search for all databases as a test
 
-RESULT=`su - postgres -c "psql -l | grep -w ${POSTGRES_DBNAME} | wc -l"`
-echo "Check default db exists"
-if [[ ! ${RESULT} == '1' ]]; then
-	echo "Create default db ${POSTGRES_DBNAME}"
-	su - postgres -c "createdb -O ${POSTGRES_USER} -T template_postgis ${POSTGRES_DBNAME}"
-else
-	echo "${POSTGRES_DBNAME} db already exists"
-fi
+for db in $(echo ${POSTGRES_DBNAME} | tr ',' ' '); do
+        RESULT=`su - postgres -c "psql -l | grep -w ${db} | wc -l"`
+        if [[ ! ${RESULT} == '1' ]]; then
+            echo "Create db ${db}"
+            su - postgres -c "createdb  -O ${POSTGRES_USER}  ${db}"
+            for ext in $(echo ${POSTGRES_MULTIPLE_EXTENSIONS} | tr ',' ' '); do
+                echo "Enabling ${ext} in the database ${db}"
+                su - postgres -c "psql -c 'CREATE EXTENSION IF NOT EXISTS ${ext} cascade;' $db"
+            done
+            echo "Loading legacy sql"
+            su - postgres -c "psql ${db} -f ${SQLDIR}/legacy_minimal.sql" || true
+            su - postgres -c "psql ${db} -f ${SQLDIR}/legacy_gist.sql" || true
+        else
+         echo "${db} db already exists"
+        fi
+done
 
 # This should show up in docker logs afterwards
 su - postgres -c "psql -l"
diff --git a/setup-replication.sh b/setup-replication.sh
index 8db18dd..b4e034c 100755
--- a/setup-replication.sh
+++ b/setup-replication.sh
@@ -74,6 +74,8 @@ cat > ${DATADIR}/recovery.conf <<EOF
 standby_mode = on
 primary_conninfo = 'host=${REPLICATE_FROM} port=${REPLICATE_PORT} user=${POSTGRES_USER} password=${POSTGRES_PASS} sslmode=${PGSSLMODE}'
 trigger_file = '${PROMOTE_FILE}'
+recovery_target_timeline='latest'
+recovery_target_action='promote'
 #restore_command = 'cp /opt/archive/%f "%p"' Use if you are syncing the wal segments from master
 EOF
 # Setup permissions. Postgres won't start without this.