diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index 64d255b57c..dca795d6ea 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -260,10 +260,10 @@ createrepo: True
 
 # Nagios global variables
 nagios_Check_Services: 
-  nrpe:true
-  sshd:true
-  named:false
-  dhcpd:false
-  httpd:false
+ - nrpe:true
+ - sshd:true
+ - named:false
+ - dhcpd:false
+ - httpd:false
 
 
diff --git a/inventory/group_vars/buildaarch64 b/inventory/group_vars/buildaarch64
index acd5a0bb20..61b495aded 100644
--- a/inventory/group_vars/buildaarch64
+++ b/inventory/group_vars/buildaarch64
@@ -27,4 +27,4 @@ csi_relationship: |
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildarm b/inventory/group_vars/buildarm
index 4de6939174..025460f89f 100644
--- a/inventory/group_vars/buildarm
+++ b/inventory/group_vars/buildarm
@@ -28,4 +28,4 @@ koji_hub: "koji.fedoraproject.org/kojihub"
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildarm-stg b/inventory/group_vars/buildarm-stg
index fd4a8498a6..57456ecefc 100644
--- a/inventory/group_vars/buildarm-stg
+++ b/inventory/group_vars/buildarm-stg
@@ -28,4 +28,4 @@ koji_hub: "koji.stg.fedoraproject.org/kojihub"
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildhw b/inventory/group_vars/buildhw
index 495d1b26ee..fc251d9c48 100644
--- a/inventory/group_vars/buildhw
+++ b/inventory/group_vars/buildhw
@@ -30,4 +30,4 @@ koji_hub: "koji.fedoraproject.org/kojihub"
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildppc b/inventory/group_vars/buildppc
index a741a4c15e..df81f8bc42 100644
--- a/inventory/group_vars/buildppc
+++ b/inventory/group_vars/buildppc
@@ -35,4 +35,4 @@ csi_relationship: |
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildppcle b/inventory/group_vars/buildppcle
index 0e9c6782e4..e98205e104 100644
--- a/inventory/group_vars/buildppcle
+++ b/inventory/group_vars/buildppcle
@@ -35,4 +35,4 @@ csi_relationship: |
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm
index ccf7c9204c..b2cfd449a0 100644
--- a/inventory/group_vars/buildvm
+++ b/inventory/group_vars/buildvm
@@ -42,4 +42,4 @@ koji_hub: "koji.fedoraproject.org/kojihub"
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildvm-aarch64 b/inventory/group_vars/buildvm-aarch64
index dce449ec0f..bfc48570d9 100644
--- a/inventory/group_vars/buildvm-aarch64
+++ b/inventory/group_vars/buildvm-aarch64
@@ -47,4 +47,4 @@ koji_hub: "koji.fedoraproject.org/kojihub"
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildvm-aarch64-stg b/inventory/group_vars/buildvm-aarch64-stg
index 9865e0ef17..941606924a 100644
--- a/inventory/group_vars/buildvm-aarch64-stg
+++ b/inventory/group_vars/buildvm-aarch64-stg
@@ -48,4 +48,4 @@ koji_hub: "koji.stg.fedoraproject.org/kojihub"
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildvm-armv7 b/inventory/group_vars/buildvm-armv7
index 43c8cf7364..b83bc1232d 100644
--- a/inventory/group_vars/buildvm-armv7
+++ b/inventory/group_vars/buildvm-armv7
@@ -47,4 +47,4 @@ koji_hub: "koji.fedoraproject.org/kojihub"
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildvm-armv7-stg b/inventory/group_vars/buildvm-armv7-stg
index 9865e0ef17..941606924a 100644
--- a/inventory/group_vars/buildvm-armv7-stg
+++ b/inventory/group_vars/buildvm-armv7-stg
@@ -48,4 +48,4 @@ koji_hub: "koji.stg.fedoraproject.org/kojihub"
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildvm-ppc64 b/inventory/group_vars/buildvm-ppc64
index 3999ab99fb..b691484b00 100644
--- a/inventory/group_vars/buildvm-ppc64
+++ b/inventory/group_vars/buildvm-ppc64
@@ -45,4 +45,4 @@ csi_relationship: |
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildvm-ppc64-stg b/inventory/group_vars/buildvm-ppc64-stg
index 9865e0ef17..941606924a 100644
--- a/inventory/group_vars/buildvm-ppc64-stg
+++ b/inventory/group_vars/buildvm-ppc64-stg
@@ -48,4 +48,4 @@ koji_hub: "koji.stg.fedoraproject.org/kojihub"
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildvm-ppc64le b/inventory/group_vars/buildvm-ppc64le
index c6fbedcd9d..f76cb279a3 100644
--- a/inventory/group_vars/buildvm-ppc64le
+++ b/inventory/group_vars/buildvm-ppc64le
@@ -44,4 +44,4 @@ csi_relationship: |
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildvm-ppc64le-stg b/inventory/group_vars/buildvm-ppc64le-stg
index 9865e0ef17..941606924a 100644
--- a/inventory/group_vars/buildvm-ppc64le-stg
+++ b/inventory/group_vars/buildvm-ppc64le-stg
@@ -48,4 +48,4 @@ koji_hub: "koji.stg.fedoraproject.org/kojihub"
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildvm-s390 b/inventory/group_vars/buildvm-s390
index 43f153691f..74bcaa663f 100644
--- a/inventory/group_vars/buildvm-s390
+++ b/inventory/group_vars/buildvm-s390
@@ -18,4 +18,4 @@ koji_hub: "koji.fedoraproject.org/kojihub"
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildvm-s390x b/inventory/group_vars/buildvm-s390x
index 1a36d4d64c..85768a5352 100644
--- a/inventory/group_vars/buildvm-s390x
+++ b/inventory/group_vars/buildvm-s390x
@@ -21,4 +21,4 @@ csi_relationship: |
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm-stg
index 9865e0ef17..941606924a 100644
--- a/inventory/group_vars/buildvm-stg
+++ b/inventory/group_vars/buildvm-stg
@@ -48,4 +48,4 @@ koji_hub: "koji.stg.fedoraproject.org/kojihub"
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false
diff --git a/inventory/group_vars/buildvmhost b/inventory/group_vars/buildvmhost
index c6ea8bbdb5..f5d7845cbb 100644
--- a/inventory/group_vars/buildvmhost
+++ b/inventory/group_vars/buildvmhost
@@ -18,4 +18,4 @@ csi_relationship: |
 
 # nagios items
 nagios_Check_Services:
-  nrpe:false
+ - nrpe:false