diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index 922c6fae71..5e5b98234f 100644
--- a/docker/gerrit/base/Dockerfile
+++ b/docker/gerrit/base/Dockerfile
@@ -67,7 +67,7 @@ ADD --chown=gerrit:gerrit https://repo1.maven.org/maven2/org/mariadb/jdbc/mariad
 # OpenDev Gerrit listens on 8081 not default of 8080
 EXPOSE 29418 8081
 
-VOLUME /var/gerrit/git /var/gerrit/index /var/gerrit/cache /var/gerrit/db /var/gerrit/etc /var/log/gerrit /var/gerrit/tmp
+VOLUME /var/gerrit/git /var/gerrit/index /var/gerrit/cache /var/gerrit/db /var/gerrit/etc /var/log/gerrit /var/gerrit/tmp /var/gerrit/data
 
 RUN ln -s /var/log/gerrit /var/gerrit/logs
 
diff --git a/inventory/service/group_vars/review.yaml b/inventory/service/group_vars/review.yaml
index fb898758cb..4674a86631 100644
--- a/inventory/service/group_vars/review.yaml
+++ b/inventory/service/group_vars/review.yaml
@@ -18,6 +18,7 @@ letsencrypt_gid: 3003
 borg_backup_excludes_extra:
   - /home/gerrit2/.launchpadlib/cache/*
   - /home/gerrit2/review_site/cache/*
+  - /home/gerrit2/review_site/data/*
   - /home/gerrit2/review_site/tmp/*
   - /home/gerrit2/review_site/index/*
   # scratch location for admins
diff --git a/playbooks/roles/gerrit/defaults/main.yaml b/playbooks/roles/gerrit/defaults/main.yaml
index d4347deb8b..27ffd19bad 100644
--- a/playbooks/roles/gerrit/defaults/main.yaml
+++ b/playbooks/roles/gerrit/defaults/main.yaml
@@ -12,6 +12,7 @@ gerrit_container_volumes:
   - /home/gerrit2/.launchpadlib:/var/gerrit/.launchpadlib
   - /home/gerrit2/.ssh:/var/gerrit/.ssh
   - /home/gerrit2/review_site/cache:/var/gerrit/cache
+  - /home/gerrit2/review_site/data:/var/gerrit/data
   - /home/gerrit2/review_site/db:/var/gerrit/db
   - /home/gerrit2/review_site/etc:/var/gerrit/etc
   - /home/gerrit2/review_site/git:/var/gerrit/git
diff --git a/playbooks/roles/gerrit/tasks/main.yaml b/playbooks/roles/gerrit/tasks/main.yaml
index dfcb220822..3a2b41ffe4 100644
--- a/playbooks/roles/gerrit/tasks/main.yaml
+++ b/playbooks/roles/gerrit/tasks/main.yaml
@@ -53,6 +53,7 @@
     mode: 0755
   loop:
     - cache
+    - data
     - db
     - etc
     - etc/its