diff --git a/roles/taskotron/buildmaster/templates/buildmaster.conf.j2 b/roles/taskotron/buildmaster/templates/buildmaster.conf.j2
index 8bc6596923..459269a14f 100644
--- a/roles/taskotron/buildmaster/templates/buildmaster.conf.j2
+++ b/roles/taskotron/buildmaster/templates/buildmaster.conf.j2
@@ -5,6 +5,8 @@
   ProxyPreserveHost On
 </Location>
 
+# The /bm/ws endpoint must be defined after the /bm endpoint, because with
+# apache the latest matching configuration is used
 <Location /{{ buildmaster_endpoint }}/ws >
   ProxyPass "ws://127.0.0.1:8010/ws"
   ProxyPassReverse "ws://127.0.0.1:8010/ws"