diff --git a/Dockerfile b/Dockerfile
index c8f4d0e15..4a75581df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM eclipse-temurin:21-jre-jammy
 
-MAINTAINER Open Identity Platform Community <open-identity-platform-openidm@googlegroups.com>
+LABEL org.opencontainers.image.authors="Open Identity Platform Community"
 
 ENV USER="openidm"
 ENV OPENIDM_OPTS="-server -XX:+UseContainerSupport --add-exports java.base/com.sun.jndi.ldap=ALL-UNNAMED -Dlogback.configurationFile=conf/logging-config.groovy"
@@ -18,10 +18,10 @@ RUN apt-get update \
  && unzip openidm-*.zip && rm -rf *.zip \
  && apt-get remove -y --purge unzip \
  && rm -rf /var/lib/apt/lists/* \
- && groupadd $USER \
- && useradd -m -r -u 1001 -g $USER $USER \
+ && useradd -m -r -u 1001 -g root $USER \
  && install -d -o $USER /opt/openidm \
- && chown -R $USER:$USER /opt/openidm \
+ && chown -R $USER:root /opt/openidm \
+ && chgrp -R 0 /opt/openidm \
  && chmod -R g=u /opt/openidm \
  && chmod +x /opt/openidm/*.sh
 
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
index 8fed3c769..b8b697d14 100644
--- a/Dockerfile-alpine
+++ b/Dockerfile-alpine
@@ -1,6 +1,6 @@
 FROM openjdk:8-jre-alpine
 
-MAINTAINER Open Identity Platform Community <open-identity-platform-openidm@googlegroups.com>
+LABEL org.opencontainers.image.authors="Open Identity Platform Community"
 
 ENV USER="openidm"
 ENV OPENIDM_OPTS="-server -XX:+UseContainerSupport -Dlogback.configurationFile=conf/logging-config.groovy"
@@ -19,10 +19,10 @@ RUN apk add --update --no-cache --virtual builddeps curl unzip \
  && bash -c 'if [ ! -z "$VERSION" ] ; then rm -rf ./*.zip ; curl -L https://github.com/OpenIdentityPlatform/OpenIDM/releases/download/$VERSION/openidm-$VERSION.zip --output openidm-$VERSION.zip ; fi' \
  && unzip openidm-*.zip && rm -rf *.zip \
  && apk del unzip \
- && addgroup -S $USER \
- && adduser -S -u 1001 -G  $USER $USER \
+ && adduser -S -u 1001 -G root $USER \
  && install -d -o $USER /opt/openidm \
- && chown -R $USER:$USER /opt/openidm \
+ && chown -R $USER:root /opt/openidm \
+ && chgrp -R 0 /opt/openidm \
  && chmod -R g=u /opt/openidm \
  && chmod +x /opt/openidm/*.sh