diff --git a/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2 b/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2
index 9148c9d4ae..eaeb87deb9 100644
--- a/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2
+++ b/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2
@@ -6,7 +6,14 @@ services:
   gerritbot-matrix:
     image: {{ gerritbot_matrix_image }}
     network_mode: host
-    user: "{{ gerritbot_uid }}:{{ gerritbot_gid }}"
+    # 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 }}"
     restart: always
     logging:
       driver: syslog