diff --git a/roles/autocloudreporter/tasks/main.yml b/roles/autocloudreporter/tasks/main.yml
index a228a7e3a4..41a665e135 100644
--- a/roles/autocloudreporter/tasks/main.yml
+++ b/roles/autocloudreporter/tasks/main.yml
@@ -13,7 +13,7 @@
 
 - name: Install required packages (Python 2)
   dnf:
-    name: ['python2-fedfind', 'python2-fedmsg-consumers', 'python2-resultsdb_api',
+    name: ['python2-fedfind', 'python2-fedmsg', 'python2-resultsdb_api',
            'python2-resultsdb_conventions-fedora', 'python2-setuptools']
     state: present
   when: "'python34-fedmsg' not in group_names"
@@ -22,7 +22,7 @@
 
 - name: Install required packages (Python 3)
   dnf:
-    name: ['python3-fedfind', 'python3-fedmsg-consumers', 'python3-resultsdb_api',
+    name: ['python3-fedfind', 'python3-fedmsg', 'python3-resultsdb_api',
            'python3-resultsdb_conventions-fedora', 'python3-setuptools']
     state: present
   when: "'python34-fedmsg' in group_names"
@@ -54,7 +54,7 @@
 
 - name: Remove autocloudreporter (Python 2)
   command: "pip2 --disable-pip-version-check uninstall autocloudreporter"
-  when: "py2acrinstalled is defined and py2acrinstalled|length>0 and 'python34-fedmsg' in group_names"
+  when: "py2acrinstalled is defined and py2acrinstalled and 'python34-fedmsg' in group_names"
   notify:
   - restart fedmsg-hub
 
@@ -62,7 +62,7 @@
   command: "python3 setup.py install"
   args:
     chdir: /root/autocloudreporter
-  when: "(gitcc is changed or (py2acrinstalled is defined and py2acrinstalled|length>0)) and 'python34-fedmsg' in group_names"
+  when: "(gitacr is changed or (py2acrinstalled is defined and py2acrinstalled)) and 'python34-fedmsg' in group_names"
   notify:
   - restart fedmsg-hub
 
@@ -75,7 +75,7 @@
 
 - name: Remove Python 2 packages
   dnf:
-    name: ['python2-fedfind', 'python2-fedmsg-consumers', 'python2-resultsdb_api',
+    name: ['python2-fedfind', 'python2-fedmsg', 'python2-resultsdb_api',
            'python2-resultsdb_conventions-fedora', 'python2-setuptools']
     state: absent
   when: "'python34-fedmsg' in group_names"
diff --git a/roles/check-compose/tasks/main.yml b/roles/check-compose/tasks/main.yml
index 370f80e4b2..0109b0c113 100644
--- a/roles/check-compose/tasks/main.yml
+++ b/roles/check-compose/tasks/main.yml
@@ -42,7 +42,7 @@
 
 - name: Install required packages (Python 2)
   dnf:
-    name: ['python2-fedfind', 'python2-fedmsg-consumers', 'python2-openqa_client',
+    name: ['python2-fedfind', 'python2-fedmsg', 'python2-openqa_client',
            'python2-setuptools', 'python2-six']
     state: present
   when: "'python34-fedmsg' not in group_names"
@@ -51,7 +51,7 @@
 
 - name: Install required packages (Python 3)
   dnf:
-    name: ['python2-pip', 'python3-fedfind', 'python3-fedmsg-consumers', 'python3-openqa_client',
+    name: ['python2-pip', 'python3-fedfind', 'python3-fedmsg', 'python3-openqa_client',
            'python3-setuptools', 'python3-six']
     state: present
   when: "'python34-fedmsg' in group_names"
@@ -83,7 +83,7 @@
 
 - name: Remove check-compose (Python 2)
   command: "pip2 --disable-pip-version-check uninstall check-compose"
-  when: "py2ccinstalled is defined and py2ccinstalled|length>0 and 'python34-fedmsg' in group_names"
+  when: "py2ccinstalled is defined and py2ccinstalled and 'python34-fedmsg' in group_names"
   notify:
   - restart fedmsg-hub
 
@@ -91,7 +91,7 @@
   command: "python3 setup.py install"
   args:
     chdir: /root/check-compose
-  when: "(gitcc is changed or (py2ccinstalled is defined and py2ccinstalled|length>0)) and 'python34-fedmsg' in group_names"
+  when: "(gitcc is changed or (py2ccinstalled is defined and py2ccinstalled)) and 'python34-fedmsg' in group_names"
   notify:
   - restart fedmsg-hub
 
@@ -104,7 +104,7 @@
 
 - name: Remove Python 2 packages
   dnf:
-    name: ['python2-fedfind', 'python2-fedmsg-consumers', 'python2-openqa_client',
+    name: ['python2-fedfind', 'python2-fedmsg', 'python2-openqa_client',
            'python2-setuptools', 'python2-six']
     state: absent
   when: "'python34-fedmsg' in group_names"
diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml
index bebb89f178..f81fa43e49 100644
--- a/roles/openqa/dispatcher/tasks/main.yml
+++ b/roles/openqa/dispatcher/tasks/main.yml
@@ -51,7 +51,7 @@
 
 - name: Install required packages (Python 2)
   dnf:
-    name: ['python2-fedfind', 'python2-wikitcms', 'python2-fedmsg-consumers',
+    name: ['python2-fedfind', 'python2-wikitcms', 'python2-fedmsg',
            'python2-openqa_client', 'python2-requests', 'python2-resultsdb_api',
            'python2-resultsdb_conventions-fedora', 'python2-setuptools', 'python-six']
     state: present
@@ -69,7 +69,7 @@
 
 - name: Install required packages (Python 3)
   dnf:
-    name: ['python2-pip', 'python3-fedfind', 'python3-wikitcms', 'python3-fedmsg-consumers',
+    name: ['python2-pip', 'python3-fedfind', 'python3-wikitcms', 'python3-fedmsg',
            'python3-openqa_client', 'python3-requests', 'python3-resultsdb_api',
            'python3-resultsdb_conventions-fedora', 'python3-setuptools', 'python3-six']
     state: present
@@ -133,7 +133,7 @@
 
 - name: Remove fedora_openqa (Python 2)
   command: "pip2 --disable-pip-version-check uninstall fedora-openqa"
-  when: "py2oqainstalled is defined and py2oqainstalled|length>0 and 'python34-fedmsg' in group_names"
+  when: "py2oqainstalled is defined and py2oqainstalled and 'python34-fedmsg' in group_names"
   notify:
   - restart fedmsg-hub
 
@@ -141,13 +141,13 @@
   command: "python3 setup.py install"
   args:
     chdir: /root/fedora_openqa
-  when: "(gittools is changed or not insttools.stat.exists or (py2oqainstalled is defined and py2oqainstalled|length>0)) and 'python34-fedmsg' in group_names"
+  when: "(gittools is changed or not insttools.stat.exists or (py2oqainstalled is defined and py2oqainstalled)) and 'python34-fedmsg' in group_names"
   notify:
   - restart fedmsg-hub
 
 - name: Remove Python 2 packages
   dnf:
-    name: ['python2-fedfind', 'python2-wikitcms', 'python2-fedmsg', 'python2-fedmsg-consumers',
+    name: ['python2-fedfind', 'python2-wikitcms', 'python2-fedmsg',
            'python2-openqa_client', 'python2-requests', 'python2-resultsdb_api',
            'python2-resultsdb_conventions-fedora', 'python2-setuptools', 'python-six']
     state: absent
diff --git a/roles/relvalconsumer/tasks/main.yml b/roles/relvalconsumer/tasks/main.yml
index e98cbcfe90..2ff4a0bc2b 100644
--- a/roles/relvalconsumer/tasks/main.yml
+++ b/roles/relvalconsumer/tasks/main.yml
@@ -25,7 +25,7 @@
 
 - name: Install required packages (Python 2)
   dnf:
-    name: ['python2-fedfind', 'python2-wikitcms', 'python2-fedmsg-consumers', 'python2-mwclient',
+    name: ['python2-fedfind', 'python2-wikitcms', 'python2-fedmsg', 'python2-mwclient',
            'python2-setuptools', 'relval']
     state: present
   when: "'python34-fedmsg' not in group_names"
@@ -40,7 +40,7 @@
 
 - name: Install required packages (Python 3)
   dnf:
-    name: ['python3-fedfind', 'python3-wikitcms', 'python3-fedmsg-consumers', 'python3-mwclient',
+    name: ['python3-fedfind', 'python3-wikitcms', 'python3-fedmsg', 'python3-mwclient',
            'python3-setuptools', 'relval']
     state: present
   when: "'python34-fedmsg' in group_names"
@@ -113,7 +113,7 @@
 
 - name: Remove relvalconsumer (Python 2)
   command: "pip2 uninstall relvalconsumer"
-  when: "py2rvinstalled is defined and py2rvinstalled|length>0 and 'python34-fedmsg' in group_names"
+  when: "py2rvinstalled is defined and py2rvinstalled and 'python34-fedmsg' in group_names"
   notify:
   - restart fedmsg-hub
 
@@ -121,7 +121,7 @@
   command: "python3 setup.py install"
   args:
     chdir: /root/relvalconsumer
-  when: "(gitrvc is changed or (py2rvinstalled is defined and py2rvinstalled|length>0)) and 'python34-fedmsg' in group_names"
+  when: "(gitrvc is changed or (py2rvinstalled is defined and py2rvinstalled)) and 'python34-fedmsg' in group_names"
   notify:
   - restart fedmsg-hub
 
@@ -135,7 +135,7 @@
 
 - name: Remove Python 2 packages
   dnf:
-    name: ['python2-fedfind', 'python2-wikitcms', 'python2-fedmsg-consumers', 'python2-mwclient',
+    name: ['python2-fedfind', 'python2-wikitcms', 'python2-fedmsg', 'python2-mwclient',
            'python2-setuptools']
     state: absent
   when: "'python34-fedmsg' in group_names"