diff --git a/docker/medpot/Dockerfile b/docker/medpot/Dockerfile
index 69837961..c5ea415b 100644
--- a/docker/medpot/Dockerfile
+++ b/docker/medpot/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 #
 # Setup apk
 RUN apk -U --no-cache add \
@@ -9,6 +9,7 @@ RUN apk -U --no-cache add \
 #
 # Setup go, build medpot
     export GOPATH=/opt/go/ && \
+    export GO111MODULE=off && \
     mkdir -p /opt/go/src && \
     cd /opt/go/src && \
     git clone https://github.com/schmalle/medpot && \
diff --git a/docker/medpot/docker-compose.yml b/docker/medpot/docker-compose.yml
index 6d6490b1..a5565475 100644
--- a/docker/medpot/docker-compose.yml
+++ b/docker/medpot/docker-compose.yml
@@ -14,7 +14,7 @@ services:
      - medpot_local
     ports:
      - "2575:2575"
-    image: "ghcr.io/telekom-security/medpot:2006"
+    image: "dtagdevsec/medpot:2006"
     read_only: true
     volumes:
      - /data/medpot/log/:/var/log/medpot
diff --git a/docker/p0f/Dockerfile b/docker/p0f/Dockerfile
index fe8ca99d..5fcc89cd 100644
--- a/docker/p0f/Dockerfile
+++ b/docker/p0f/Dockerfile
@@ -1,4 +1,6 @@
-FROM alpine:3.13
+# In case of problems Alpine 3.13 needs to be used:
+# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
+FROM alpine:3.14
 #
 # Add source
 ADD . /opt/p0f
diff --git a/docker/p0f/docker-compose.yml b/docker/p0f/docker-compose.yml
index f3f18081..0b1329b8 100644
--- a/docker/p0f/docker-compose.yml
+++ b/docker/p0f/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     container_name: p0f
     restart: always
     network_mode: "host"
-    image: "ghcr.io/telekom-security/p0f:2006"
+    image: "dtagdevsec/p0f:2006"
     read_only: true
     volumes:
      - /data/p0f/log:/var/log/p0f