diff --git a/playbooks/roles/gerrit/defaults/main.yaml b/playbooks/roles/gerrit/defaults/main.yaml
index 36859e2dd5..c82db6b8da 100644
--- a/playbooks/roles/gerrit/defaults/main.yaml
+++ b/playbooks/roles/gerrit/defaults/main.yaml
@@ -7,16 +7,17 @@ gerrit_run_init: false
 gerrit_packed_git_open_files: 4096
 gerrit_container_image: docker.io/opendevorg/gerrit:3.2
 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/db:/var/gerrit/db
   - /home/gerrit2/review_site/etc:/var/gerrit/etc
   - /home/gerrit2/review_site/git:/var/gerrit/git
-  - /home/gerrit2/review_site/tmp:/var/gerrit/tmp
   - /home/gerrit2/review_site/hooks:/var/gerrit/hooks
   - /home/gerrit2/review_site/index:/var/gerrit/index
   - /home/gerrit2/review_site/logs:/var/log/gerrit
   - /home/gerrit2/review_site/static:/var/gerrit/static
-  - /home/gerrit2/.launchpadlib:/var/gerrit/.launchpadlib
-  - /home/gerrit2/.ssh:/var/gerrit/.ssh
+  - /home/gerrit2/review_site/tmp:/var/gerrit/tmp
   - /opt/project-config/gerrit/projects.yaml:/var/gerrit/etc/projects.yaml
   - /opt/project-config/gerrit/projects.ini:/var/gerrit/etc/projects.ini
 gerrit_database_type: MYSQL
diff --git a/playbooks/roles/gerrit/tasks/main.yaml b/playbooks/roles/gerrit/tasks/main.yaml
index 1c13df7508..c2984f743a 100644
--- a/playbooks/roles/gerrit/tasks/main.yaml
+++ b/playbooks/roles/gerrit/tasks/main.yaml
@@ -52,14 +52,15 @@
     group: "{{ gerrit_user_name }}"
     mode: 0755
   loop:
+    - cache
+    - db
     - etc
     - git
-    - index
-    - cache
-    - static
     - hooks
-    - tmp
+    - index
     - logs
+    - static
+    - tmp
 
 - name: Write Gerrit config file
   template: