diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml
index afed0540ac..40ec644d4d 100644
--- a/playbooks/vhost_reboot.yml
+++ b/playbooks/vhost_reboot.yml
@@ -35,7 +35,7 @@
 
 # Call out to another playbook.  Disable any proxies that may live here
 - include: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies
-  when: nodns is not defined or not nodns
+  when: nodns is not defined or not "true" in nodns
 
 - name: halt instances
   hosts: myvms_new
diff --git a/roles/nagios/client/templates/check_varnish_proc.cfg.j2 b/roles/nagios/client/templates/check_varnish_proc.cfg.j2
index 3935c16e5a..69f6760554 100644
--- a/roles/nagios/client/templates/check_varnish_proc.cfg.j2
+++ b/roles/nagios/client/templates/check_varnish_proc.cfg.j2
@@ -1 +1 @@
-command[check_varnish_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:2 -C 'varnishd' -u varnish
+command[check_varnish_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:2 -C 'varnishd' -u nobody
diff --git a/roles/nagios_client/templates/check_varnish_proc.cfg.j2 b/roles/nagios_client/templates/check_varnish_proc.cfg.j2
index 3935c16e5a..69f6760554 100644
--- a/roles/nagios_client/templates/check_varnish_proc.cfg.j2
+++ b/roles/nagios_client/templates/check_varnish_proc.cfg.j2
@@ -1 +1 @@
-command[check_varnish_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:2 -C 'varnishd' -u varnish
+command[check_varnish_proc]=/usr/lib64/nagios/plugins/check_procs -c 1:2 -C 'varnishd' -u nobody