diff --git a/docker/gerrit/2.13/Dockerfile b/docker/gerrit/2.13/Dockerfile
index 9d588976aa..00e5ae1294 100644
--- a/docker/gerrit/2.13/Dockerfile
+++ b/docker/gerrit/2.13/Dockerfile
@@ -34,8 +34,10 @@ RUN addgroup gerrit --gid 3000 --system \
 USER gerrit
 
 # Download the gerrit war
-RUN mkdir /var/gerrit/bin && \
-  wget https://tarballs.openstack.org/gerrit/gerrit-v2.13.12.11.1707fec.war -O /var/gerrit/bin/gerrit.war
+RUN mkdir /var/gerrit/bin \
+  && mkdir /var/gerrit/hooks \
+  && mkdir /var/gerrit/static \
+  && wget https://tarballs.openstack.org/gerrit/gerrit-v2.13.12.11.1707fec.war -O /var/gerrit/bin/gerrit.war
 
 # Install plugins
 RUN mkdir /var/gerrit/plugins && \
@@ -53,7 +55,7 @@ RUN mkdir /var/gerrit/lib && \
 # Allow incoming traffic
 EXPOSE 29418 8080
 
-VOLUME /var/gerrit/git /var/gerrit/index /var/gerrit/cache /var/gerrit/db /var/gerrit/etc /var/log/gerrit
+VOLUME /var/gerrit/git /var/gerrit/index /var/gerrit/cache /var/gerrit/db /var/gerrit/etc /var/log/gerrit /var/gerrit/tmp
 
 RUN ln -s /var/log/gerrit /var/gerrit/logs
 
diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index acb4871da4..ee997bfd52 100644
--- a/docker/gerrit/base/Dockerfile
+++ b/docker/gerrit/base/Dockerfile
@@ -42,12 +42,14 @@ RUN addgroup gerrit --gid 3000 --system \
     gerrit
 
 USER gerrit
-RUN mkdir /var/gerrit/bin
+RUN mkdir /var/gerrit/bin \
+  && mkdir /var/gerrit/hooks \
+  && mkdir /var/gerrit/static
 
 # Allow incoming traffic
 EXPOSE 29418 8080
 
-VOLUME /var/gerrit/git /var/gerrit/index /var/gerrit/cache /var/gerrit/db /var/gerrit/etc /var/log/gerrit
+VOLUME /var/gerrit/git /var/gerrit/index /var/gerrit/cache /var/gerrit/db /var/gerrit/etc /var/log/gerrit /var/gerrit/tmp
 
 RUN ln -s /var/log/gerrit /var/gerrit/logs