diff --git a/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org b/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org
index a0ff7a1ae0..611bfc854d 100644
--- a/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org
+++ b/inventory/host_vars/copr-dist-git-dev.aws.fedoraproject.org
@@ -25,7 +25,7 @@ copr_hostbase: copr-dist-git-dev
 
 nagios_Check_Services:
   mail: false
-  nrpe: false
+  nrpe: true
   sshd: false
   named: false
   dhcpd: false
diff --git a/inventory/host_vars/copr-dist-git.aws.fedoraproject.org b/inventory/host_vars/copr-dist-git.aws.fedoraproject.org
index c0f149fbd8..e2d5e87c36 100644
--- a/inventory/host_vars/copr-dist-git.aws.fedoraproject.org
+++ b/inventory/host_vars/copr-dist-git.aws.fedoraproject.org
@@ -25,7 +25,7 @@ copr_hostbase: copr-dist-git
 
 nagios_Check_Services:
   mail: false
-  nrpe: false
+  nrpe: true
   sshd: false
   named: false
   dhcpd: false
diff --git a/inventory/host_vars/copr-fe.aws.fedoraproject.org b/inventory/host_vars/copr-fe.aws.fedoraproject.org
index e9ce2d88a3..809815d73c 100644
--- a/inventory/host_vars/copr-fe.aws.fedoraproject.org
+++ b/inventory/host_vars/copr-fe.aws.fedoraproject.org
@@ -25,7 +25,7 @@ db_backup_dir: ['/backups']
 
 nagios_Check_Services:
   mail: false
-  nrpe: false
+  nrpe: true
   sshd: false
   named: false
   dhcpd: false
diff --git a/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org b/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org
index fc9efa2342..b15b2b9dda 100644
--- a/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org
+++ b/inventory/host_vars/copr-keygen-dev.aws.fedoraproject.org
@@ -19,7 +19,7 @@ description: copr key gen and sign host - dev instance
 
 nagios_Check_Services:
   mail: false
-  nrpe: false
+  nrpe: true
   sshd: false
   named: false
   dhcpd: false
diff --git a/inventory/host_vars/copr-keygen.aws.fedoraproject.org b/inventory/host_vars/copr-keygen.aws.fedoraproject.org
index dcec9185f6..e092a83056 100644
--- a/inventory/host_vars/copr-keygen.aws.fedoraproject.org
+++ b/inventory/host_vars/copr-keygen.aws.fedoraproject.org
@@ -19,7 +19,7 @@ description: copr key gen and sign host - prod instance
 
 nagios_Check_Services:
   mail: false
-  nrpe: false
+  nrpe: true
   sshd: true
   named: false
   dhcpd: false
diff --git a/roles/nagios_client/templates/check_disk.cfg.j2 b/roles/nagios_client/templates/check_disk.cfg.j2
index 7be4edb624..e6e8257809 100644
--- a/roles/nagios_client/templates/check_disk.cfg.j2
+++ b/roles/nagios_client/templates/check_disk.cfg.j2
@@ -16,5 +16,8 @@ command[check_disk_/srv/diskimages]=/usr/lib64/nagios/plugins/check_disk -w 20%
 command[check_disk_/srv/registry]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/registry
 command[check_disk_/u01]=/usr/lib64/nagios/plugins/check_disk -w 15% -c 10% -p /u01
 command[check_disk_/var/lib/copr/public_html]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /var/lib/copr/public_html
+command[check_disk_/var/lib/dist-git]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /var/lib/dist-git
+command[check_disk_/var/lib/copr-keygen]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /var/lib/copr-keygen
+command[check_disk_/srv/copr-fe]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/copr-fe
 command[check_disk_/var/lib64/mock]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /var/lib/mock
 command[check_disk_/var/log]=/usr/lib64/nagios/plugins/check_disk -w 15% -c 10% -p /var/log
diff --git a/roles/nagios_server/files/nagios/services/copr.cfg b/roles/nagios_server/files/nagios/services/copr.cfg
index 1a0c603fbf..e929927dfb 100644
--- a/roles/nagios_server/files/nagios/services/copr.cfg
+++ b/roles/nagios_server/files/nagios/services/copr.cfg
@@ -4,3 +4,24 @@ define service {
     check_command          check_by_nrpe!check_disk_/var/lib/copr/public_html
     use                    disktemplate
 }
+
+define service {
+    hostgroup_name         copr_dist_git_aws, copr_dist_git_dev_aws
+    service_description    Disk space on Copr DistGit used for imported packages
+    check_command          check_by_nrpe!check_disk_/var/lib/dist-git
+    use                    disktemplate
+}
+
+define service {
+    hostgroup_name         copr_front_aws, copr_front_dev_aws
+    service_description    Disk space on Copr Frontend used for the database
+    check_command          check_by_nrpe!check_disk_/srv/copr-fe
+    use                    disktemplate
+}
+
+define service {
+    hostgroup_name         copr_keygen_aws, copr_keygen_dev_aws
+    service_description    Disk space on Copr Keygen used for GPG keys
+    check_command          check_by_nrpe!check_disk_/var/lib/copr-keygen
+    use                    disktemplate
+}
diff --git a/roles/nagios_server/templates/nrpe/nrpe.cfg.j2 b/roles/nagios_server/templates/nrpe/nrpe.cfg.j2
index 2fd8613256..801bcffedc 100644
--- a/roles/nagios_server/templates/nrpe/nrpe.cfg.j2
+++ b/roles/nagios_server/templates/nrpe/nrpe.cfg.j2
@@ -302,6 +302,9 @@ command[check_disk_/srv/diskimages]=/usr/lib64/nagios/plugins/check_disk -w 20%
 command[check_disk_/srv/registry]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/registry
 command[check_disk_/u01]=/usr/lib64/nagios/plugins/check_disk -w 15% -c 10% -p /u01
 command[check_disk_/var/lib/copr/public_html]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /var/lib/copr/public_html
+command[check_disk_/var/lib/dist-git]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /var/lib/dist-git
+command[check_disk_/var/lib/copr-keygen]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /var/lib/copr-keygen
+command[check_disk_/srv/copr-fe]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/copr-fe
 command[check_disk_/var/lib64/mock]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /var/lib/mock
 command[check_disk_/var/log]=/usr/lib64/nagios/plugins/check_disk -w 15% -c 10% -p /var/log
 command[check_zombie_procs]=/usr/lib64/nagios/plugins/check_procs -w 15 -c 25 -s Z