diff --git a/ckan-pycsw/Dockerfile b/ckan-pycsw/Dockerfile
index 3d2c7eb..4fa1f0e 100644
--- a/ckan-pycsw/Dockerfile
+++ b/ckan-pycsw/Dockerfile
@@ -1,5 +1,6 @@
 # Base image
 FROM ghcr.io/mjanez/ckan-pycsw:main AS base
+LABEL maintainer="mnl.janez@gmail.com"
 
 # ckan-pycsw envvars
 ENV APP_DIR=/app
@@ -19,6 +20,4 @@ WORKDIR ${APP_DIR}
 # Update files if needed
 COPY pycsw/conf/pycsw.conf.template docker-entrypoint.d/entrypoint.sh ./
 
-USER root
-
 ENTRYPOINT ["/bin/bash", "./entrypoint.sh"]
\ No newline at end of file
diff --git a/ckan-pycsw/docker-entrypoint.d/entrypoint.sh b/ckan-pycsw/docker-entrypoint.d/entrypoint.sh
index c7a0e60..9e24c2e 100644
--- a/ckan-pycsw/docker-entrypoint.d/entrypoint.sh
+++ b/ckan-pycsw/docker-entrypoint.d/entrypoint.sh
@@ -2,13 +2,6 @@
 
 set -xeuo pipefail
 
-# Change ownership of log and metadata directories
-chown -R $USERNAME:$USERNAME ${APP_DIR}/log
-chown -R $USERNAME:$USERNAME ${APP_DIR}/metadata
-
-# Switch to the non-root user
-su - $USERNAME
-
 envsubst < pycsw.conf.template > pycsw.conf
 
 #TODO: -Xfrozen_modules=off from: https://bugs.python.org/issue1666807