diff --git a/playbooks/roles/matrix-gerritbot/defaults/main.yaml b/playbooks/roles/matrix-gerritbot/defaults/main.yaml
index c349425987..841cbd208d 100644
--- a/playbooks/roles/matrix-gerritbot/defaults/main.yaml
+++ b/playbooks/roles/matrix-gerritbot/defaults/main.yaml
@@ -1,6 +1,6 @@
 gerritbot_gid: 11000
 gerritbot_uid: 11000
-gerritbot_matrix_version: 4aeeac8
+gerritbot_matrix_version: g2wr8krm32cp8afrw9qq3cxilsy2nsk0
 gerritbot_matrix_image: quay.io/software-factory/gerritbot-matrix:{{ gerritbot_matrix_version }}
 gerritbot_matrix_prometheus_port: 9001
 
diff --git a/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2 b/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2
index eaeb87deb9..9baedbabd0 100644
--- a/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2
+++ b/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2
@@ -6,14 +6,7 @@ services:
   gerritbot-matrix:
     image: {{ gerritbot_matrix_image }}
     network_mode: host
-    # Temporarily (I hope) undo the gerritbot user override as the process
-    # complains with:
-    #  2021-11-19 17:50:14.995 [ThreadId 4]: Session created for: UserID "@gerrit:opendev.org"
-    #
-    #  Warning: Could not get or create the default cache directory:
-    #
-    #  gerritbot-matrix: <stderr>: hPutChar: invalid argument (invalid character)
-    #user: "{{ gerritbot_uid }}:{{ gerritbot_gid }}"
+    user: "{{ gerritbot_uid }}:{{ gerritbot_gid }}"
     restart: always
     logging:
       driver: syslog
@@ -24,7 +17,7 @@ services:
       MATRIX_IDENTITY_TOKEN: {{ gerritbot_matrix_identity_token }}
     volumes:
       - /var/lib/matrix-gerritbot/config:/config:ro
-      - /var/lib/matrix-gerritbot/ssh:/root/.ssh:ro
+      - /var/lib/matrix-gerritbot/ssh:/home/bot/.ssh:ro
     healthcheck:
       test: "gerritbot-matrix check {{ gerritbot_matrix_prometheus_port }}"
       retries: 6