diff --git a/roles/nagios_server/files/nagios/services/ping.cfg b/roles/nagios_server/files/nagios/services/ping.cfg
deleted file mode 100644
index 6b850d4c4e..0000000000
--- a/roles/nagios_server/files/nagios/services/ping.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-define service {
-  hostgroup_name		all,!no_ping, !buildvm_armv7, !buildvm_s390x
-  service_description		ICMP-Ping4
-  check_command			check_ping4!350.0,20%!500.0,60%
-  use				criticaltemplate
-}
-
-define service {
-  hostgroup_name		buildvm_armv7, buildvm_s390x
-  service_description		ICMP-Ping4-vm-builders
-  check_command			check_ping4!1500.0,20%!2500.0,80%
-  use				criticaltemplate
-}
-
-define service {
-  host_name		nagios-external.fedoraproject.org
-  service_description		ICMP-Ping6-check
-  check_command			check-host-alive6!fedorapeople.org!1500.0,20%!2500.0,80%
-  use				criticaltemplate
-}
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 73597d57da..021f33e8cd 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -147,6 +147,16 @@
   - nagios_server
   notify: restart nagios
 
+## Copy over the template command scripts
+- name: Copy /etc/nagios/commands (templates)
+  templates: src=nagios/commands/{{ item }} dest=/etc/nagios/commands/{{ item }}
+  with_items:
+    - ping.cfg
+  tags:
+  - nagios_config
+  - nagios_server
+  notify: restart nagios
+
 ## Copy over the contacts
 - name: Copy /etc/nagios/contacts
   synchronize: src=nagios/contacts/ dest=/etc/nagios/contacts/
diff --git a/roles/nagios_server/templates/nagios/services/ping.cfg b/roles/nagios_server/templates/nagios/services/ping.cfg
new file mode 100644
index 0000000000..3a43c1973f
--- /dev/null
+++ b/roles/nagios_server/templates/nagios/services/ping.cfg
@@ -0,0 +1,22 @@
+define service {
+  hostgroup_name		all,!no_ping, !buildvm_armv7, !buildvm_s390x
+  service_description		ICMP-Ping4
+  check_command			check_ping4!350.0,20%!500.0,60%
+  use				criticaltemplate
+}
+
+define service {
+  hostgroup_name		buildvm_armv7, buildvm_s390x
+  service_description		ICMP-Ping4-vm-builders
+  check_command			check_ping4!1500.0,20%!2500.0,80%
+  use				criticaltemplate
+}
+
+{% if vars['nagios_location'] == 'external' %}                                                       
+ define service {
+   host_name            nagios-external.fedoraproject.org                            
+   service_description          ICMP-Ping6-check
+   check_command                        check-host-alive6!fedorapeople.org!1500.0,20%!2500.0,80%
+   use                          criticaltemplate
+ }
+{% endif %}