diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml
index adeb9d4e0f..4c10a42ec7 100644
--- a/playbooks/groups/bodhi-backend.yml
+++ b/playbooks/groups/bodhi-backend.yml
@@ -72,9 +72,11 @@
     cert_src: "{{private}}/files/docker-registry/{{env}}/pki/issued/containerstable.crt"
     key_src: "{{private}}/files/docker-registry/{{env}}/pki/private/containerstable.key"
     certs_group: apache
+  # We can remove the when statement when Bodhi 4.0.0 is deployed to production.
   - role: rabbit/user
     username: "bodhi{{ env_suffix }}"
     when: env == "staging"
+  # We can remove the when statement when Bodhi 4.0.0 is deployed to production.
   - role: rabbit/queue
     username: "bodhi{{ env_suffix }}"
     queue_name: "bodhi{{ env_suffix }}"