diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 3af98abcb3..d1fc0c05f3 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -38,17 +38,12 @@
   - nagios_server
 
 - name: Copy /etc/nagios config
-  copy: src={{nagios_srcdir}}/ dest=/etc/nagios owner=nagios group=nagios
+  synchronize: src={{nagios_srcdir}}/ dest=/etc/nagios/
   tags:
   - nagios-config
   - nagios_server
   notify: restart nagios
 
-- name: Copy checkcommands.cfg
-  template: src={{nagios_srcdir}}/checkcommands.cfg dest=/etc/nagios/checkcommands.cfg owner=nagios group=nagios
-  tags:
-  - nagios_server
-
 - name: Copy httpd config
   template: src=nagios-httpd.conf dest=/etc/httpd/conf.d/nagios.conf
   tags:
diff --git a/roles/tftp_server/tasks/main.yml b/roles/tftp_server/tasks/main.yml
index b0645478b6..fe990529e2 100644
--- a/roles/tftp_server/tasks/main.yml
+++ b/roles/tftp_server/tasks/main.yml
@@ -31,4 +31,4 @@
   - tftp_server
 
 - name: fill up the tftpboot directory
-  copy: src="{{ bigfiles }}/tftpboot/" dest=/var/lib/tftpboot/
+  synchronize: src="{{ bigfiles }}/tftpboot/" dest=/var/lib/tftpboot/