diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml
index 23041309a1..390346330a 100644
--- a/roles/copr/backend/tasks/main.yml
+++ b/roles/copr/backend/tasks/main.yml
@@ -31,6 +31,7 @@
       - php-cli
       - nfs-utils
       - golang-github-prometheus-node-exporter
+      - nagios-plugins-http
 
 #- name: patch for prunerepo, issue 1090
 #  patch: src=patches/prunerepo-dataloss.patch
diff --git a/roles/copr/dist_git/tasks/main.yml b/roles/copr/dist_git/tasks/main.yml
index 8f14955514..21753e8e53 100644
--- a/roles/copr/dist_git/tasks/main.yml
+++ b/roles/copr/dist_git/tasks/main.yml
@@ -19,6 +19,7 @@
       - rdiff-backup
       - scl-utils-build
       - tmpwatch
+      - nagios-plugins-http
 
 - name: install latest dist-git and copr-dist-git
   dnf:
diff --git a/roles/copr/frontend/tasks/main.yml b/roles/copr/frontend/tasks/main.yml
index 8f97dcefe1..0375d1572c 100644
--- a/roles/copr/frontend/tasks/main.yml
+++ b/roles/copr/frontend/tasks/main.yml
@@ -41,6 +41,7 @@
       - python3-alembic
       - mod_auth_gssapi
       - golang-github-prometheus-node-exporter
+      - nagios-plugins-http
   tags:
   - packages
 
diff --git a/roles/nagios_server/templates/nagios/services/websites.cfg.j2 b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
index 5568265034..f95bdfac6e 100644
--- a/roles/nagios_server/templates/nagios/services/websites.cfg.j2
+++ b/roles/nagios_server/templates/nagios/services/websites.cfg.j2
@@ -354,23 +354,31 @@ define service {
 
 define service {
   hostgroup_name        proxies
-  service_description   download.copr.fedorainfracloud.org-https
+  service_description   http-download.copr.fedorainfracloud.org
   check_command         check_website_ssl!download.copr.fedorainfracloud.org!Index of /
   max_check_attempts    8
   use                   websitetemplate
 }
 
 define service {
-  host_name             noc01.iad2.fedoraproject.org
-  service_description   copr-dist-git.fedorainfracloud.org-https
+  host_name             copr-dist-git.aws.fedoraproject.org
+  service_description   http-copr-be.aws.fedoraproject.org
+  check_command         check_https!copr-be.aws.fedoraproject.org
+  max_check_attempts    8
+  use                   websitetemplate
+}
+
+define service {
+  host_name             copr-fe.aws.fedoraproject.org
+  service_description   http-copr-dist-git.fedorainfracloud.org
   check_command         check_website_ssl!copr-dist-git.fedorainfracloud.org!/cgit/!Git repository browser
   max_check_attempts    8
   use                   websitetemplate
 }
 
 define service {
-  host_name             noc01.iad2.fedoraproject.org
-  service_description   copr.fedorainfracloud.org-https
+  host_name             copr-be.aws.fedoraproject.org
+  service_description   http-copr.fedorainfracloud.org
   check_command         check_website_ssl!copr.fedorainfracloud.org!Copr hosts
   max_check_attempts    8
   use                   websitetemplate