diff --git a/Dockerfile b/Dockerfile
index deaeec9..38f2d47 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,8 +23,16 @@ LABEL org.opensuse.reference="%%REGISTRY%%/%%TAGPREFIX%%/cdi-uploadserver:%%PKG_
 # endlabelprefix
 
 RUN zypper -n install \
-           qemu-tools qemu-block-curl tar util-linux \
-           containerized-data-importer-uploadserver && \
-    zypper clean -a
+           containerized-data-importer-uploadserver \
+           curl \
+           libnbd \
+           qemu-tools \
+           shadow \
+           tar \
+           util-linux && \
+    zypper clean -a && \
+    useradd -u 1001 --create-home -s /bin/bash cdi-uploadserver
 
+WORKDIR /home/cdi-uploadserver
+USER 1001
 ENTRYPOINT [ "/usr/bin/virt-cdi-uploadserver", "-alsologtostderr" ]
diff --git a/cdi-uploadserver-container.changes b/cdi-uploadserver-container.changes
index f846bcc..5fb5958 100644
--- a/cdi-uploadserver-container.changes
+++ b/cdi-uploadserver-container.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 13 14:52:40 UTC 2022 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Create an unprivileged user to run as non-root
+- Align the installed packages with the upstream
+
 -------------------------------------------------------------------
 Thu Aug  4 07:48:37 UTC 2022 - Vasily Ulyanov <vasily.ulyanov@suse.com>