diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml
index 9699e09549..f6b603253c 100644
--- a/roles/nagios_client/tasks/main.yml
+++ b/roles/nagios_client/tasks/main.yml
@@ -17,39 +17,13 @@
   tags:
   - packages
   - nagios_client
-  when: ansible_distribution_major_version|int < 22
-
-# install pkgs:
-- name: install nagios client pkgs
-  dnf: name={{ item }} state=present
-  with_items:
-  - nrpe
-  - nagios-plugins
-  - nagios-plugins-disk
-  - nagios-plugins-file_age
-  - nagios-plugins-users
-  - nagios-plugins-procs
-  - nagios-plugins-swap
-  - nagios-plugins-load
-  - nagios-plugins-ping
-  tags:
-  - packages
-  - nagios_client
-  when: ansible_distribution_major_version|int > 21
 
 - name: install nagios tcp check for mirrorlist proxies
   package: name=nagios-plugins-tcp state=present
   tags:
   - packages
   - nagios_client
-  when: ansible_distribution_major_version|int < 22 and 'mirrorlist-proxies' in group_names
-
-- name: install nagios tcp check for mirrorlist proxies
-  dnf: name=nagios-plugins-tcp state=present
-  tags:
-  - packages
-  - nagios_client
-  when: ansible_distribution_major_version|int > 21 and 'mirrorlist-proxies' in group_names
+  when: 'mailman' in group_names or 'mirrorlist-proxies' in group_names
 
 - name: install local nrpe check scripts that are not packaged
   copy: src="scripts/{{ item }}" dest="{{ libdir }}/nagios/plugins/{{ item }}" mode=0755 owner=nagios group=nagios
diff --git a/roles/nagios_server/files/nagios/services/mailman.cfg b/roles/nagios_server/files/nagios/services/mailman.cfg
new file mode 100644
index 0000000000..a8659cb108
--- /dev/null
+++ b/roles/nagios_server/files/nagios/services/mailman.cfg
@@ -0,0 +1,7 @@
+define service {
+  host_name             mailman01.phx2.fedoraproject.org
+  service_description   check mailman api
+  check_command         check_mailman_api
+  max_check_attempts    5
+  use                   defaulttemplate
+}
diff --git a/roles/nagios_server/files/nrpe/nrpe.cfg b/roles/nagios_server/files/nrpe/nrpe.cfg
index dcec90b25e..39235b7771 100644
--- a/roles/nagios_server/files/nrpe/nrpe.cfg
+++ b/roles/nagios_server/files/nrpe/nrpe.cfg
@@ -344,6 +344,7 @@ command[check_koschei_repo_resolver_proc]=/usr/lib64/nagios/plugins/check_procs
 command[check_koschei_scheduler_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-schedul -c 1:1
 command[check_koschei_watcher_proc]=/usr/lib64/nagios/plugins/check_procs -s RSD -u koschei -C koschei-watcher -c 1:1
 command[check_mirrorlist_docker_proxy]=/usr/lib64/nagios/plugins/check_tcp -H localhost -p 18081
+command[check_mailman_api]=/usr/lib64/nagios/plugins/check_http -H localhost -p 8001 -u /3.0
 command[check_odcs_backend_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:1 -C 'odcs-bakend' -u odcs
 
 # The following are fedmsg/datanommer checks to be run on busgateway01.