diff --git a/Dockerfile.image-service b/Dockerfile.image-service
index f444b32e..63be228d 100644
--- a/Dockerfile.image-service
+++ b/Dockerfile.image-service
@@ -37,12 +37,14 @@ LABEL maintainer "Red Hat"
 COPY --from=licenses /tmp/licenses /licenses
 
 ARG DATA_DIR=/data
-RUN mkdir $DATA_DIR && chmod 775 $DATA_DIR
+ARG UID=1001
+ARG GID=1001
+RUN mkdir $DATA_DIR && chmod 775 $DATA_DIR && chown $UID:$GID /data
 VOLUME $DATA_DIR
 ENV DATA_DIR=$DATA_DIR
 
 COPY --from=builder /assisted-image-service /assisted-image-service
 
-USER 1001:1001
+USER $UID:$GID
 
 CMD ["/assisted-image-service"]