diff --git a/auth/docker/Dockerfile.config b/auth/docker/Dockerfile.config
index ca3df76..a6d6d4f 100644
--- a/auth/docker/Dockerfile.config
+++ b/auth/docker/Dockerfile.config
@@ -37,7 +37,8 @@
 COPY bin/aaf-auth-cmd-${AAF_VERSION}-full.jar /opt/app/aaf_config/bin/
 COPY bin/aaf-auth-batch-${AAF_VERSION}-full.jar /opt/app/aaf_config/bin/
 
-RUN chown -R aaf:aaf /opt/app/aaf_config && mkdir /opt/app/osaaf && chown aaf:aaf /opt/app/osaaf
+RUN chown -R ${USER}:${USER} /opt/app/aaf_config 
+RUN mkdir -p /opt/app/osaaf && chown ${USER}:${USER} /opt/app/osaaf
 
 CMD ["/bin/bash","/opt/app/aaf_config/bin/agent.sh"]
 CMD []