diff --git a/.devops/s390x.Dockerfile b/.devops/s390x.Dockerfile
index 99e8d1a30f..6d10eee1b7 100644
--- a/.devops/s390x.Dockerfile
+++ b/.devops/s390x.Dockerfile
@@ -64,14 +64,14 @@ COPY --from=collector /lib/distro /lib/s390x-linux-gnu
 ### CLI Only
 FROM --platform=linux/s390x base AS light
 
+USER root:root
+WORKDIR /llama.cpp/bin
+
 # Copy llama.cpp binaries and libraries
 COPY --from=collector /bin/llama.cpp/llama-cli       /llama.cpp/bin
 COPY --from=collector /bin/llama.cpp/libggml-cpu.so  /llama.cpp/bin
 COPY --from=collector /bin/llama.cpp/libggml-blas.so /llama.cpp/bin
 
-USER root:root
-WORKDIR /models
-
 ENTRYPOINT [ "/llama.cpp/bin/llama-cli" ]
 
 
@@ -80,6 +80,9 @@ FROM --platform=linux/s390x gcr.io/distroless/cc-debian${DEBIAN_VERSION}:nonroot
 
 ENV LLAMA_ARG_HOST=0.0.0.0
 
+USER nonroot:nonroot
+WORKDIR /llama.cpp/bin
+
 # Copy llama.cpp binaries and libraries
 COPY --from=collector /bin/llama.cpp/llama-server /llama.cpp/bin
 COPY --from=collector /lib/llama.cpp /usr/lib/s390x-linux-gnu
@@ -91,8 +94,6 @@ COPY --from=collector /bin/llama.cpp/libggml-blas.so /llama.cpp/bin
 # Copy all distro libraries
 COPY --from=collector /lib/distro /lib/s390x-linux-gnu
 
-USER nonroot:nonroot
-WORKDIR /models
 EXPOSE 8080
 
 ENTRYPOINT [ "/llama.cpp/bin/llama-server" ]