diff --git a/Dockerfile b/Dockerfile
index 2e5540d..2a9cd80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,7 +33,9 @@ ENV PS1="$(whoami)@dsmr_reader_docker:$(pwd)\\$ " \
 ENV QEMU_ARCH=${QEMU_ARCH:-x86_64} \
   DSMR_VERSION=${DSMR_VERSION} \
   DOCKER_TARGET_RELEASE=${DOCKER_TARGET_RELEASE} \
-  PIP_NO_CACHE_DIR=1
+  PIP_NO_CACHE_DIR=1 \
+  S6_SERVICES_GRACETIME=300000 \
+  S6_CMD_WAIT_FOR_SERVICES_MAXTIME=5000000
 
 ENV DJANGO_SECRET_KEY=dsmrreader \
   DJANGO_DATABASE_ENGINE=django.db.backends.postgresql \
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/branding b/rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/branding
index 211da7b..d037916 100755
--- a/rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/branding
+++ b/rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/branding
@@ -12,4 +12,4 @@
     DSMR-protocol reader, telegram data storage and
             energy consumption visualizer.
 
-    ───────────────────────────────────────────────────
+    ───────────────────────────────────────────────────
\ No newline at end of file
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/run b/rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/run
index 8d05373..7c1cfed 100755
--- a/rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/run
@@ -17,16 +17,14 @@ function _pre_reqs() {
     _info "DSMR Reader Reader release: ${DSMR_VERSION}"
     _info "DSMR Reader Reader Docker release: ${DOCKER_TARGET_RELEASE}"
 
-    cat /etc/s6-overlay/s6-rc.d/docker-entrypoint/branding
-
     DUID=${DUID:-803}
     DGID=${DGID:-803}
 
-    groupmod -o -g "${DGID}" app
-    usermod -o -u "${DUID}" app
+    groupmod -o -g "${DGID}" app 2>&1 >/dev/null
+    usermod -o -u "${DUID}" app 2>&1 >/dev/null
 
+    cat /etc/s6-overlay/s6-rc.d/docker-entrypoint/branding
     echo "
-    ───────────────────────────────────────────────────
     User UID: $(id -u app)
     User GID: $(id -g app)
     ───────────────────────────────────────────────────