diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index ba34511..d2f629b 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -49,7 +49,6 @@ COPY .docker/entrypoint.sh /usr/local/bin/entrypoint
 RUN python3 -m pip install --break-system-packages /greenbone-feed-sync/*
 
 RUN chown -R gvm:gvm /greenbone-feed-sync && \
-  chown -R gvm:gvm /var/lib/ && \
   chmod 755 /usr/local/bin/entrypoint
 
 ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
diff --git a/.docker/entrypoint.sh b/.docker/entrypoint.sh
index 2cb28d6..be34b47 100644
--- a/.docker/entrypoint.sh
+++ b/.docker/entrypoint.sh
@@ -1,3 +1,14 @@
 #!/bin/bash
 
+# Ensure the directories for lock files exist and are owned by gvm.
+# This part runs as root (the default user before gosu) to ensure permissions are set correctly.
+mkdir -p /var/lib/openvas
+chown gvm:gvm /var/lib/openvas
+chmod 775 /var/lib/openvas # Give group write access as well, for broader compatibility
+
+mkdir -p /var/lib/gvm
+chown gvm:gvm /var/lib/gvm
+chmod 775 /var/lib/gvm # Give group write access as well, for broader compatibility
+
+# Now execute the main command passed to the container as the gvm user.
 exec gosu gvm "$@"