diff --git a/.env b/.env
index 7bf5c5a..158f866 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,7 @@
 #!/bin/sh
 CCG_PROJECT=devpi
-DOCKER_DEVPI_SERVER_VERSION=4.1.1
-DOCKER_DEVPI_CLIENT_VERSION=2.7.0
-DOCKER_DEVPI_WEB_VERSION=3.1.1
+DOCKER_DEVPI_SERVER_VERSION=4.5.0
+DOCKER_DEVPI_CLIENT_VERSION=4.0.2
+DOCKER_DEVPI_WEB_VERSION=3.3.0
 DOCKER_ROUTE
 BRANCH_NAME
diff --git a/Dockerfile b/Dockerfile
index ce8a750..3a4aeb0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 #
-FROM python:3.5-alpine
-MAINTAINER https://github.com/muccg/
+FROM python:3.6.5
+LABEL maintainer="https://github.com/muccg/"
 
-ARG ARG_DEVPI_SERVER_VERSION
-ARG ARG_DEVPI_WEB_VERSION
-ARG ARG_DEVPI_CLIENT_VERSION
+ARG ARG_DEVPI_SERVER_VERSION=4.5.0
+ARG ARG_DEVPI_WEB_VERSION=3.3.0
+ARG ARG_DEVPI_CLIENT_VERSION=4.0.2
 
 ENV DEVPI_SERVER_VERSION $ARG_DEVPI_SERVER_VERSION
 ENV DEVPI_WEB_VERSION $ARG_DEVPI_WEB_VERSION
@@ -15,12 +15,9 @@ ENV PIP_TRUSTED_HOST="127.0.0.1"
 ENV VIRTUAL_ENV /env
 
 # devpi user
-RUN addgroup -S -g 1000 devpi \
-    && adduser -D -S -u 1000 -h /data -s /sbin/nologin -G devpi devpi
+RUN addgroup --system --gid 1000 devpi \
+    && adduser --disabled-password --system --uid 1000 --home /data --shell /sbin/nologin --gid 1000 devpi
 
-# entrypoint is written in bash
-RUN apk add --no-cache bash
- 
 # create a virtual env in $VIRTUAL_ENV, ensure it respects pip version
 RUN pip install virtualenv \
     && virtualenv $VIRTUAL_ENV \
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index c1b8cc2..d181a44 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -12,7 +12,7 @@ function defaults {
 
 function initialise_devpi {
     echo "[RUN]: Initialise devpi-server"
-    devpi-server --restrict-modify root --start --host 127.0.0.1 --port 3141
+    devpi-server --restrict-modify root --start --host 127.0.0.1 --port 3141 --init
     devpi-server --status
     devpi use http://localhost:3141
     devpi login root --password=''