diff --git a/docker/honeysap/Dockerfile b/docker/honeysap/Dockerfile
index f445a965..54743d2a 100644
--- a/docker/honeysap/Dockerfile
+++ b/docker/honeysap/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
 #
 # Include dist
 ADD dist/ /root/dist/
@@ -8,7 +8,6 @@ RUN apk -U --no-cache add \
             build-base \
             git \
 	    libstdc++ \
-	    py2-markupsafe \
             python2 \
             python2-dev \
             py2-pip \
@@ -22,6 +21,7 @@ RUN apk -U --no-cache add \
     mkdir conf && \
     cp /root/dist/* conf/ && \
     python setup.py install && \
+    pip install markupsafe && \
     pip install -r requirements-optional.txt && \
 #
 # Setup user, groups and configs
diff --git a/docker/honeysap/docker-compose.yml b/docker/honeysap/docker-compose.yml
index 032f5607..830a8c0b 100644
--- a/docker/honeysap/docker-compose.yml
+++ b/docker/honeysap/docker-compose.yml
@@ -14,6 +14,6 @@ services:
      - honeysap_local
     ports:
      - "3299:3299"
-    image: "ghcr.io/telekom-security/honeysap:2006"
+    image: "dtagdevsec/honeysap:2006"
     volumes:
      - /data/honeysap/log:/opt/honeysap/log