diff --git a/2.3.0/Dockerfile b/2.3.0/Dockerfile
index ad1d3d3..710f3c9 100644
--- a/2.3.0/Dockerfile
+++ b/2.3.0/Dockerfile
@@ -119,7 +119,7 @@ RUN ln -s usr/local/bin/docker-entrypoint.sh /docker-entrypoint.sh # backwards c
 ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
 
 # Setup directories and permissions
-RUN chown -R couchdb:couchdb /opt/couchdb/etc/default.d/ /opt/couchdb/etc/vm.args
+RUN find /opt/couchdb \! \( -user couchdb -group couchdb \) -exec chown -f couchdb:couchdb '{}' +
 VOLUME /opt/couchdb/data
 
 # 5984: Main CouchDB endpoint
diff --git a/2.3.1/Dockerfile b/2.3.1/Dockerfile
index da02869..a266ed8 100644
--- a/2.3.1/Dockerfile
+++ b/2.3.1/Dockerfile
@@ -122,7 +122,7 @@ RUN ln -s usr/local/bin/docker-entrypoint.sh /docker-entrypoint.sh # backwards c
 ENTRYPOINT ["tini", "--", "/docker-entrypoint.sh"]
 
 # Setup directories and permissions
-RUN chown -R couchdb:couchdb /opt/couchdb/etc/default.d/ /opt/couchdb/etc/vm.args
+RUN find /opt/couchdb \! \( -user couchdb -group couchdb \) -exec chown -f couchdb:couchdb '{}' +
 VOLUME /opt/couchdb/data
 
 # 5984: Main CouchDB endpoint
diff --git a/dev/Dockerfile b/dev/Dockerfile
index d888ead..f3ab329 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -146,7 +146,7 @@ COPY vm.args /opt/couchdb/etc/
 COPY docker-entrypoint.sh /
 
 # Setup directories and permissions
-RUN chown -R couchdb:couchdb /opt/couchdb/etc/default.d/ /opt/couchdb/etc/vm.args
+RUN find /opt/couchdb \! \( -user couchdb -group couchdb \) -exec chown -f couchdb:couchdb '{}' +
 
 WORKDIR /opt/couchdb
 EXPOSE 5984 4369 9100