diff --git a/Dockerfile b/Dockerfile
index a0a1ab2..dc73ab6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -91,8 +91,7 @@ RUN PACKAGE_URL=$( echo ${PACKAGE_URL} | sed "s/TARGETARCH/"${TARGETARCH}"/g") &
     chmod 755 /app/ds/*.sh && \
     rm -f /tmp/$(basename "$PACKAGE_URL") && \
     rm -rf /var/log/$COMPANY_NAME && \
-    rm -rf /var/lib/apt/lists/* && \
-    usermod -a -G root ds;
+    rm -rf /var/lib/apt/lists/*
 
 VOLUME /var/log/$COMPANY_NAME /var/lib/$COMPANY_NAME /var/www/$COMPANY_NAME/Data /var/lib/postgresql /var/lib/rabbitmq /var/lib/redis /usr/share/fonts/truetype/custom
 
diff --git a/run-document-server.sh b/run-document-server.sh
index cfba7a0..c7aff44 100755
--- a/run-document-server.sh
+++ b/run-document-server.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+umask 0022
+
 function clean_exit {
   /usr/bin/documentserver-prepare4shutdown.sh
 }
@@ -591,6 +593,8 @@ else
   update_welcome_page
 fi
 
+find /etc/${COMPANY_NAME} -exec chown ds:ds {} \;
+
 #start needed local services
 for i in ${LOCAL_SERVICES[@]}; do
   service $i start