diff --git a/docker/DebugDockerfile b/docker/DebugDockerfile
index c3f817bec..624e73129 100644
--- a/docker/DebugDockerfile
+++ b/docker/DebugDockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:20.04
-MAINTAINER Team ACID @ Zalando <team-acid@zalando.de>
+LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"
 
 # We need root certificates to deal with teams api over https
 RUN apk --no-cache add ca-certificates go git musl-dev
diff --git a/ui/Dockerfile b/ui/Dockerfile
index 5ea912dbc..3711019e3 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -1,5 +1,5 @@
-FROM alpine:3.6
-MAINTAINER team-acid@zalando.de
+FROM ubuntu:20.04
+LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"
 
 EXPOSE 8081