diff --git a/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2 b/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2
index 9baedbabd0..b857cce0ce 100644
--- a/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2
+++ b/playbooks/roles/matrix-gerritbot/templates/docker-compose.yaml.j2
@@ -6,7 +6,9 @@ services:
   gerritbot-matrix:
     image: {{ gerritbot_matrix_image }}
     network_mode: host
-    user: "{{ gerritbot_uid }}:{{ gerritbot_gid }}"
+    # TODO: Continue sorting out how to make this work with the
+    # image published by SF.io
+    #user: "{{ gerritbot_uid }}:{{ gerritbot_gid }}"
     restart: always
     logging:
       driver: syslog