diff --git a/docker/postgis/Dockerfile b/docker/postgis/Dockerfile
index 9371d4b6..3828e77d 100644
--- a/docker/postgis/Dockerfile
+++ b/docker/postgis/Dockerfile
@@ -2,7 +2,7 @@
 # the postgis base image has outdated ogr2ogr (gdal-bin package)
 # does not support PG12 yet, which means postgis-preloaded cannot be built easily.
 # Once it is updated, or there is a different way to build it, we can upgrade to 12.
-ARG BASE_POSTGIS_VER=9.6-3.0
+ARG BASE_POSTGIS_VER=11-3.0
 FROM postgis/postgis:$BASE_POSTGIS_VER
 
 LABEL maintainer="Yuri Astrakhan <YuriAstrakhan@gmail.com>"
diff --git a/docker/postgis/README.md b/docker/postgis/README.md
index 66358178..c32e22d6 100644
--- a/docker/postgis/README.md
+++ b/docker/postgis/README.md
@@ -1,7 +1,7 @@
 # PostGIS + OSM-specific extensions Docker image
 [![](https://images.microbadger.com/badges/image/openmaptiles/postgis.svg)](https://microbadger.com/images/openmaptiles/postgis "Get your own image badge on microbadger.com") [![Docker Automated buil](https://img.shields.io/docker/automated/openmaptiles/postgis.svg)]()
 
-This images is based on PostgreSQL 9.6 and PostGIS 3.0 [Docker image](https://hub.docker.com/r/postgis/postgis/) and includes [osml10n extension](https://github.com/giggls/mapnik-german-l10n.git) - OSM-specific label manipulation support.
+This images is based on PostgreSQL 11 and PostGIS 3.0 [Docker image](https://hub.docker.com/r/postgis/postgis/) and includes [osml10n extension](https://github.com/giggls/mapnik-german-l10n.git) - OSM-specific label manipulation support.
 
 ## Usage
 
diff --git a/docker/postgis/initdb-postgis.sh b/docker/postgis/initdb-postgis.sh
index b7d30886..7641365c 100755
--- a/docker/postgis/initdb-postgis.sh
+++ b/docker/postgis/initdb-postgis.sh
@@ -3,6 +3,13 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
+echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+echo "  Pre-configuring PostgreSQL"
+echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+PGUSER="$POSTGRES_USER" psql --dbname="postgres" <<-'EOSQL'
+    ALTER SYSTEM SET jit = 'off';
+EOSQL
+
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
 echo "  Loading OMT postgis extensions"
 echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"