diff --git a/CHANGELOG.md b/CHANGELOG.md
index 624d7e6f..cc56100f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ Unreleased
 
 Nothing
 
+3.1.0
+-----
+
+- Upgrade to PostgreSQL 11
+
 3.0.3
 -----
 
diff --git a/DRAUPNIR_VERSION b/DRAUPNIR_VERSION
index 75a22a26..fd2a0186 100644
--- a/DRAUPNIR_VERSION
+++ b/DRAUPNIR_VERSION
@@ -1 +1 @@
-3.0.3
+3.1.0
diff --git a/Dockerfile b/Dockerfile
index 4bd762fb..1b9755c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:16.04
 
-ENV POSTGRESQL_VERSION=9.4
+ENV POSTGRESQL_VERSION=11
 RUN set -x \
     && apt-get update \
     && apt-get install -y \
@@ -9,7 +9,7 @@ RUN set -x \
         curl \
         sudo \
         btrfs-tools \
-    && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main\ndeb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg 9.4" > /etc/apt/sources.list.d/pgdg.list \
+    && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main\ndeb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg 11" > /etc/apt/sources.list.d/pgdg.list \
       && curl --silent -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
     && apt-get update -y \
     && apt-get install -y \
diff --git a/cmd/draupnir-create-instance b/cmd/draupnir-create-instance
index 3ce8a876..0bf84599 100755
--- a/cmd/draupnir-create-instance
+++ b/cmd/draupnir-create-instance
@@ -16,7 +16,7 @@ if ! [[ "$#" -eq 4 ]]; then
   exit 1
 fi
 
-PG_CTL=/usr/lib/postgresql/9.4/bin/pg_ctl
+PG_CTL=/usr/lib/postgresql/11/bin/pg_ctl
 
 ROOT=$1
 IMAGE_ID=$2
diff --git a/cmd/draupnir-destroy-instance b/cmd/draupnir-destroy-instance
index 6771d295..bc1c72e8 100755
--- a/cmd/draupnir-destroy-instance
+++ b/cmd/draupnir-destroy-instance
@@ -17,7 +17,7 @@ if ! [[ "$#" -eq 2 ]]; then
   exit 1
 fi
 
-PG_CTL=/usr/lib/postgresql/9.4/bin/pg_ctl
+PG_CTL=/usr/lib/postgresql/11/bin/pg_ctl
 
 ROOT=$1
 ID=$2
diff --git a/cmd/draupnir-finalise-image b/cmd/draupnir-finalise-image
index b1268475..255d2997 100755
--- a/cmd/draupnir-finalise-image
+++ b/cmd/draupnir-finalise-image
@@ -26,8 +26,8 @@ if ! [[ "$#" -eq 4 ]]; then
   exit 1
 fi
 
-PG_CTL=/usr/lib/postgresql/9.4/bin/pg_ctl
-VACUUMDB=/usr/lib/postgresql/9.4/bin/vacuumdb
+PG_CTL=/usr/lib/postgresql/11/bin/pg_ctl
+VACUUMDB=/usr/lib/postgresql/11/bin/vacuumdb
 PSQL=/usr/bin/psql
 
 ROOT=$1
@@ -51,7 +51,7 @@ if sudo sh -c "ls ${UPLOAD_PATH}/*.tar*"; then
 	sudo sh -c "rm -f ${UPLOAD_PATH}/*.tar*" # remove the compressed backup file(s)
 fi
 
-if ! sudo -u postgres /usr/lib/postgresql/9.4/bin/pg_controldata "${UPLOAD_PATH}"; then
+if ! sudo -u postgres /usr/lib/postgresql/11/bin/pg_controldata "${UPLOAD_PATH}"; then
 	echo "image upload is not valid postgresql data directory"
 	exit 255
 fi
@@ -90,6 +90,7 @@ work_mem = '128MB'
 # requires a significant amount of IO. Similarly, fsync should be turned off
 # during finalisation.
 hot_standby = 'off'
+max_wal_senders = 0
 wal_level = 'minimal'
 fsync = 'off'
 EOF
diff --git a/spec/fixtures/db.tar b/spec/fixtures/db.tar
index 96acddb4..c6d38b30 100644
Binary files a/spec/fixtures/db.tar and b/spec/fixtures/db.tar differ