diff --git a/roles/nagios/client/tasks/main.yml b/roles/nagios/client/tasks/main.yml
index 81ce2b707d..e2d1a1412f 100644
--- a/roles/nagios/client/tasks/main.yml
+++ b/roles/nagios/client/tasks/main.yml
@@ -155,7 +155,7 @@
 #
 - name: install nrpe openvpn check config
   template: src=check_openvpn_link.cfg.j2 dest=/etc/nrpe.d/check_openvpn_link.cfg
-  when: datacenter != 'phx2'
+  when: vpn == true
   notify:
   - restart nrpe
   tags:
diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml
index 2d5250c3f7..1eb7ebb704 100644
--- a/roles/nagios_client/tasks/main.yml
+++ b/roles/nagios_client/tasks/main.yml
@@ -156,7 +156,7 @@
 #
 - name: install nrpe openvpn check config
   template: src=check_openvpn_link.cfg.j2 dest=/etc/nrpe.d/check_openvpn_link.cfg
-  when: datacenter != 'phx2'
+  when: vpn == true
   notify:
   - restart nrpe
   tags:
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index b6e57de218..6fb80df421 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -262,7 +262,7 @@
   - nagios_server
 
 - name: Template over commands
-  template: src=nagios/templates/{{item}}.j2 dest=/etc/nagios/commands/{{item}} mode=0644 owner=root group=root
+  template: src=nagios/templates/commands/{{item}}.j2 dest=/etc/nagios/commands/{{item}} mode=0644 owner=root group=root
   with_items:
     - postgres.cfg
   tags: