diff --git a/Dockerfile b/Dockerfile
index ca947f7..07162b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,6 +31,6 @@ RUN zypper -n install \
     zypper clean -a && \
     useradd -u 1001 --create-home -s /bin/bash cdi-cloner
 
-WORKDIR /home/cdi-cloner
+WORKDIR /usr/bin
 USER 1001
 ENTRYPOINT [ "/usr/bin/cloner_startup.sh" ]
diff --git a/cdi-cloner-container.changes b/cdi-cloner-container.changes
index 3d70747..903db7d 100644
--- a/cdi-cloner-container.changes
+++ b/cdi-cloner-container.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 12 05:05:45 UTC 2023 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Make the WORKDIR aligned with the upstream
+  The cloner pod is configured to run as a different non-root user and
+  an attempt to access /home/cdi-cloner fails with EACCES.
+
 -------------------------------------------------------------------
 Thu Oct 13 16:38:42 UTC 2022 - Vasily Ulyanov <vasily.ulyanov@suse.com>