diff --git a/opensearch/Dockerfile b/opensearch/Dockerfile
index f830e66..c0794b0 100644
--- a/opensearch/Dockerfile
+++ b/opensearch/Dockerfile
@@ -1,19 +1,18 @@
 FROM opensearchproject/opensearch:2.7.0
 ARG OPENSEARCH_ID
 ARG OPENSEARCH_GID
-ENV OPENSEARCH_ID "$OPENSEARCH_ID"
-ENV OPENSEARCH_GID "$OPENSEARCH_GID"
 
-ENV VIRTUAL_ENV=/opensearch
+ENV OPENSEARCH_ID="$OPENSEARCH_ID" \
+    OPENSEARCH_GID="$OPENSEARCH_GID" \
+    VIRTUAL_ENV=/opensearch
 
-COPY opensearch.yml /usr/share/opensearch/config/
-COPY thesaurus.conf /usr/share/opensearch/config/
-COPY jvm.options /usr/share/opensearch/config/
+COPY opensearch.yml thesaurus.conf jvm.options /usr/share/opensearch/config/
 
 USER root:root
-RUN usermod -u ${OPENSEARCH_ID} opensearch
-RUN groupmod -g ${OPENSEARCH_GID} opensearch
-RUN chown -R opensearch:root /usr/share/opensearch/config/
+RUN usermod -u ${OPENSEARCH_ID} opensearch \
+    && groupmod -g ${OPENSEARCH_GID} opensearch \
+    && chown -R ${OPENSEARCH_ID}:${OPENSEARCH_GID} /usr/share/opensearch/
+
 # Support arbitrary UIDs as per OpenShift guidelines
 USER ${OPENSEARCH_ID}:${OPENSEARCH_GID}