diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 4d19054649..67500afda4 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -119,6 +119,27 @@
 ## Copy over the command scripts
 - name: Copy /etc/nagios/commands
   synchronize: src=nagios/commands/ dest=/etc/nagios/commands/
+  copy: src=nagios/commands/{{ item }} dest=/etc/nagios/commands/{{ item }}
+  with_items:
+    - bzr.cfg
+    - disk.cfg
+    - dns.cfg
+    - git.cfg
+    - httpd.cfg
+    - koji.cfg
+    - local.cfg
+    - misc.cfg
+    - notify.cfg
+    - nrpe.cfg
+    - perfdata.cfg
+    - ping.cfg
+    - rsyslog.cfg
+    - smtp.cfg
+    - ssh.cfg
+    - tcp.cfg
+    - testcloud.cfg
+    - udp.cfg
+    - unbound.cfg
   tags:
   - nagios-config
   - nagios_server
@@ -241,6 +262,13 @@
   tags:
   - nagios_server
 
+- name: Template over commands
+  template: src=nagios/templates/{{item}}.j2 dest=/etc/nagios/commands/{{item}} mode=0644 owner=root group=root
+  with_items:
+    - postgres.cfg
+  tags:
+  - nagios_server
+
 - name: Template over services
   template: src=nagios/services/{{item}}.j2 dest=/etc/nagios/services/{{item}} mode=0644 owner=root group=root
   with_items:
diff --git a/roles/nagios_server/files/nagios/commands/postgres.cfg b/roles/nagios_server/templates/nagios/commands/postgres.cfg.j2
similarity index 100%
rename from roles/nagios_server/files/nagios/commands/postgres.cfg
rename to roles/nagios_server/templates/nagios/commands/postgres.cfg.j2