diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml
index 88fbb781ca..69f3565882 100644
--- a/playbooks/groups/sundries.yml
+++ b/playbooks/groups/sundries.yml
@@ -52,14 +52,10 @@
   - role: developer/build
     when: master_sundries_node|bool
   - { role: fedmsg/base,
-      when:
-        - master_sundries_node|bool
-        - deployment_type == "prod" }
+      when: master_sundries_node|bool and deployment_type == "prod" }
   - { role: rabbit/user,
       username: "sundries{{ env_suffix }}",
-      when:
-        - master_sundries_node|bool
-        - deployment_type == "stg" }
+      when: master_sundries_node|bool and deployment_type == "stg" }
   - role: fedmsg/base
     when: master_sundries_node|bool
   - role: nfs/client