diff --git a/Dockerfile.production b/Dockerfile.production
index 36519b6..5150524 100644
--- a/Dockerfile.production
+++ b/Dockerfile.production
@@ -84,6 +84,12 @@
     bash \
     libmagic
 
+# Create app user
+RUN addgroup -g 1000 appuser && \
+    adduser -u 1000 -G appuser -D appuser && \
+    mkdir -p /app/osmclient && \
+    chown -R appuser:appuser /app
+
 ENV VIRTUAL_ENV=/app/osmclient/.venv \
     PATH="/app/osmclient/.venv/bin:$PATH"
 
@@ -91,19 +97,13 @@
 COPY --from=builder --chown=appuser:appuser /app/osmclient/.venv /app/osmclient/.venv
 
 # Copy OSM binaries
-COPY --from=builder /app/osmclient/.venv/bin/osm /usr/local/bin/osm
+# COPY --from=builder /app/osmclient/.venv/bin/osm /usr/local/bin/osm
 COPY scripts/charm.sh /usr/sbin/charm
 
 # Add additional client tools
 COPY scripts/install-client-tools.sh /tmp/install-client-tools.sh
 RUN bash /tmp/install-client-tools.sh
 
-# Create app user
-RUN addgroup -g 1000 appuser && \
-    adduser -u 1000 -G appuser -D appuser && \
-    mkdir -p /app/osmclient && \
-    chown -R appuser:appuser /app
-
 WORKDIR /app/osmclient
 
 # Set environment variables
@@ -115,6 +115,7 @@
     OSM_PROJECT=admin
 
 # Switch to non-root user
-USER appuser
+USER appuser:appuser
 
-CMD ["/usr/local/bin/osm"]
+# CMD ["/usr/local/bin/osm"]
+CMD ["osm"]