diff --git a/roles/taskotron/resultsdb-backend/tasks/main.yml b/roles/taskotron/resultsdb-backend/tasks/main.yml
index 5417e631cb..46e6ee5e62 100644
--- a/roles/taskotron/resultsdb-backend/tasks/main.yml
+++ b/roles/taskotron/resultsdb-backend/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: ensure packages required for resultsdb are installed (yum)
   yum: name={{ item }} state=present
-  when: deployment_type == 'prod' or deployment_type == 'local'
+  when: ansible_distribution_major_version|int < 22
   with_items:
     - resultsdb
     - mod_wsgi
diff --git a/roles/taskotron/resultsdb-frontend/tasks/main.yml b/roles/taskotron/resultsdb-frontend/tasks/main.yml
index 4d54ea2928..220ad63b2f 100644
--- a/roles/taskotron/resultsdb-frontend/tasks/main.yml
+++ b/roles/taskotron/resultsdb-frontend/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 - name: ensure packages required for resultsdb_frontend are installed (yum)
   yum: name={{ item }} state=present enablerepo={{ extra_enablerepos }}
-  when: deployment_type == 'prod' or deployment_type == 'local'
+  when: ansible_distribution_major_version|int < 22
   with_items:
     - resultsdb_frontend
     - mod_wsgi