diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index f53ea6f7ef..98a057a63b 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 238d97779a..b088b42b2b 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 40445039f1..6fc1915166 100644
--- a/inventory/group_vars/buildarm
+++ b/inventory/group_vars/buildarm
@@ -29,4 +29,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 e9eb69af45..55cd57512f 100644
--- a/inventory/group_vars/buildarm-stg
+++ b/inventory/group_vars/buildarm-stg
@@ -29,4 +29,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 5127494d64..d5d2ffe3e8 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 e77acee625..55bf284db5 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 b5f6554c47..fe594bafff 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 4d5d1b9cb0..970595d33d 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 63ebb0aba3..9aee5cc799 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 bcc38887ce..5d46947fc1 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 cf1c99c219..333f86cdc7 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 bcc38887ce..5d46947fc1 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 54c26d53ac..bc08714bb1 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 bcc38887ce..5d46947fc1 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 63587dcf97..02475b6b38 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 bcc38887ce..5d46947fc1 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 2177b0500b..e628c5ba51 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 0405627f4c..34fe063e11 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 bcc38887ce..5d46947fc1 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 8f2506fccd..c764e2900d 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