diff --git a/openam-distribution/openam-distribution-docker/Dockerfile b/openam-distribution/openam-distribution-docker/Dockerfile
index 760a5f3214..7886e068ac 100644
--- a/openam-distribution/openam-distribution-docker/Dockerfile
+++ b/openam-distribution/openam-distribution-docker/Dockerfile
@@ -24,6 +24,8 @@ RUN apt-get update && apt-get install -y curl unzip \
  && mkdir /usr/openam/ssoadmintools && unzip /usr/openam/ssoadmintools.zip -d /usr/openam/ssoadmintools && rm /usr/openam/ssoadmintools.zip \
  && chgrp -R 0 /usr/openam/ \
  && chmod -R g=u /usr/openam/ \
+ && chgrp -R 0 $CATALINA_HOME \
+ && chmod -R g=u $CATALINA_HOME \
  && useradd -m -r -u 1001 -g root $OPENAM_USER \
  && install -d -o $OPENAM_USER $OPENAM_DATA_DIR \
  && chown -R $OPENAM_USER:root $CATALINA_HOME \
diff --git a/openam-distribution/openam-distribution-docker/Dockerfile-alpine b/openam-distribution/openam-distribution-docker/Dockerfile-alpine
index 66dbd8a2e3..69c8a6e79a 100644
--- a/openam-distribution/openam-distribution-docker/Dockerfile-alpine
+++ b/openam-distribution/openam-distribution-docker/Dockerfile-alpine
@@ -23,6 +23,8 @@ RUN apk add --update --no-cache --virtual curl builddeps unzip bash && apk upgra
  && mkdir /usr/openam/ssoadmintools && unzip /usr/openam/ssoadmintools.zip -d /usr/openam/ssoadmintools && rm /usr/openam/ssoadmintools.zip \
  && chgrp -R 0 /usr/openam/ \
  && chmod -R g=u /usr/openam/ \
+ && chgrp -R 0 $CATALINA_HOME \
+ && chmod -R g=u $CATALINA_HOME \
  && adduser -S -u 1001 -G root $OPENAM_USER \
  && install -d -o $OPENAM_USER $OPENAM_DATA_DIR \
  && chown -R $OPENAM_USER:root $CATALINA_HOME \