diff --git a/Dockerfile b/Dockerfile
index 630e6ec..2308ea1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,6 +43,7 @@ ENV XDG_RUNTIME_DIR=/home/$BUILDUSER/agent/xdg-run
 ENV BUILDAH_ISOLATION=chroot
 ENV _CONTAINERS_USERNS_CONFIGURED=""
 ENV TRIVY_TEMPLATE="@/home/jenkins/html.tpl"
+ENV HOME=/home/$BUILDUSER
 
 USER $BUILDUSER
 
diff --git a/entrypoint.sh b/entrypoint.sh
index e44e937..502575b 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-mkdir -p $HOME/agent/xdg-run
+mkdir -p $HOME/agent/xdg-run $HOME/agent/containers/run $HOME/agent/containers/storage
 /usr/local/bin/jenkins-agent