diff --git a/roles/waiverdb/tasks/main.yml b/roles/waiverdb/tasks/main.yml
index 8ed0068400..72da81133a 100644
--- a/roles/waiverdb/tasks/main.yml
+++ b/roles/waiverdb/tasks/main.yml
@@ -1,13 +1,23 @@
 ---
 - include: psql_setup.yml
 
-- name: install needed packages
+- name: install needed packages (yum)
+  yum: pkg={{ item }} state=present
+  with_items:
+  - waiverdb
+  - gunicorn
+  notify:
+  - restart waiverdb
+  when: ansible_distribution_major_version|int < 22
+
+- name: install needed packages (dnf)
   dnf: pkg={{ item }} state=present
   with_items:
   - waiverdb
   - gunicorn
   notify:
   - restart waiverdb
+  when: ansible_distribution_major_version|int > 21
 
 - name: start waiverdb on boot
   systemd:
diff --git a/roles/waiverdb/tasks/psql_setup.yml b/roles/waiverdb/tasks/psql_setup.yml
index 04f93b5ae5..38e0f6ad0d 100644
--- a/roles/waiverdb/tasks/psql_setup.yml
+++ b/roles/waiverdb/tasks/psql_setup.yml
@@ -1,8 +1,16 @@
-- name: install postresql
+- name: install postresql (yum)
   yum: state=present pkg={{ item }}
   with_items:
   - "postgresql-server"
   - "postgresql-contrib"
+  when: ansible_distribution_major_version|int < 22
+
+- name: install postresql (dnf)
+  dnf: state=present pkg={{ item }}
+  with_items:
+  - "postgresql-server"
+  - "postgresql-contrib"
+  when: ansible_distribution_major_version|int > 21
 
 - name: See if postgreSQL is installed
   stat: path=/var/lib/pgsql/initdb.log