diff --git a/postgres-s3/Dockerfile b/postgres-s3/Dockerfile
index dfc580d..b9f771a 100644
--- a/postgres-s3/Dockerfile
+++ b/postgres-s3/Dockerfile
@@ -1,6 +1,8 @@
-FROM python:3.5-alpine
+FROM python:3.6-slim
 MAINTAINER "Yigal Duppen" <yigal@publysher.nl>
 
+SHELL ["/bin/bash", "-c"]
+
 WORKDIR /app/
 EXPOSE 8000
 STOPSIGNAL SIGINT
@@ -14,12 +16,25 @@ LABEL   org.label-schema.schema-version="1.0" \
         org.label-schema.vendor="Publysher BV" \
         org.label-schema.docker.dockerfile="./postgres-s3/Dockerfile"
 
-RUN apk update \
-    && apk add \
-        'postgresql<9.6' \
-    && rm -rf /var/cache/apk/* \
+RUN apt-get update \
+	  && apt-get install -yqq --no-install-recommends \
+      wget \
+      lsb-release \
+      sudo \
+      gnupg \
+    && rm -rf /var/lib/apt/lists/*
+
+
+
+# Install Postgresql11
+# https://computingforgeeks.com/how-to-install-postgresql-11-on-debian-9-debian-8/
+RUN export RELEASE=$(lsb_release -cs) \
+		&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - \
+		&& echo "deb http://apt.postgresql.org/pub/repos/apt/ ${RELEASE}"-pgdg main | sudo tee  /etc/apt/sources.list.d/pgdg.list \
+		&& sudo apt update && sudo apt -y install postgresql-11 \
+    && rm -rf /var/lib/apt/lists/* \
     && pip3 install awscli \
-    && adduser -S service \
+    && adduser --system service \
     && mkdir -p /app/ /data/  \
     && chown service /data/
 USER service
diff --git a/postgres-s3/check-health.sh b/postgres-s3/check-health.sh
index 74f8c5e..8e18c1e 100755
--- a/postgres-s3/check-health.sh
+++ b/postgres-s3/check-health.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 set -e
 set -u
 
diff --git a/postgres-s3/create-backup.sh b/postgres-s3/create-backup.sh
index a1fd6a9..9c4428d 100755
--- a/postgres-s3/create-backup.sh
+++ b/postgres-s3/create-backup.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 set -e
 set -u
 
diff --git a/postgres-s3/restore.sh b/postgres-s3/restore.sh
index 6179730..b324706 100755
--- a/postgres-s3/restore.sh
+++ b/postgres-s3/restore.sh
@@ -1,5 +1,5 @@
-#!/usr/bin/env sh
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+#!/usr/bin/env bash
 set -e
 set -u
 
diff --git a/postgres-s3/variables.sh b/postgres-s3/variables.sh
index 05dd476..c0ae60d 100755
--- a/postgres-s3/variables.sh
+++ b/postgres-s3/variables.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 set -e
 set -u