diff --git a/Dockerfile.llamacpp-cpu b/Dockerfile.llamacpp-cpu
index fce9915a..07a2d066 100644
--- a/Dockerfile.llamacpp-cpu
+++ b/Dockerfile.llamacpp-cpu
@@ -50,12 +50,14 @@ ARG GID=65534
 RUN adduser --system --gid ${GID} --uid ${UID} --home /home/worker worker
 WORKDIR /home/worker/app
 
-RUN chown worker /home/worker/app
-RUN mkdir local_data && chown worker local_data
-RUN mkdir models && chown worker models
+RUN mkdir -p /home/worker/app/local_data/private_gpt && \
+    mkdir -p /home/worker/app/models && \
+    chown -R worker /home/worker/app && \
+    chown -R worker /home/worker/app/local_data && \
+    chown -R worker /home/worker/app/models
 COPY --chown=worker --from=dependencies /home/worker/app/.venv/ .venv
 COPY --chown=worker private_gpt/ private_gpt
-COPY --chown=worker *.yaml ./
+COPY --chown=worker *.yaml .
 COPY --chown=worker scripts/ scripts
 
 USER worker
diff --git a/Dockerfile.ollama b/Dockerfile.ollama
index 5a8b73ac..43076ab9 100644
--- a/Dockerfile.ollama
+++ b/Dockerfile.ollama
@@ -39,9 +39,9 @@ ARG GID=65534
 RUN adduser --system --gid ${GID} --uid ${UID} --home /home/worker worker
 WORKDIR /home/worker/app
 
-RUN chown worker /home/worker/app
-RUN mkdir local_data && chown worker local_data
-RUN mkdir models && chown worker models
+RUN mkdir -p /home/worker/app/local_data/private_gpt && \
+    chown -R worker /home/worker/app && \
+    chown -R worker /home/worker/app/local_data
 COPY --chown=worker --from=dependencies /home/worker/app/.venv/ .venv
 COPY --chown=worker private_gpt/ private_gpt
 COPY --chown=worker *.yaml .