diff --git a/roles/nagios_server/files/nagios/configs/nagios.cfg b/roles/nagios_server/files/nagios/configs/nagios.cfg
index b6110acdae..5828e15af7 100644
--- a/roles/nagios_server/files/nagios/configs/nagios.cfg
+++ b/roles/nagios_server/files/nagios/configs/nagios.cfg
@@ -31,8 +31,6 @@ log_file=/var/log/nagios/nagios.log
 cfg_file=/etc/nagios/timeperiods.cfg
 #cfg_file=/etc/nagios/objects/templates.cfg
 cfg_file=/etc/nagios/escalations.cfg
-cfg_file=/etc/nagios/checkcommands.cfg
-cfg_file=/etc/nagios/misccommands.cfg
 
 # Definitions for monitoring the local (Linux) host
 #cfg_file=/etc/nagios/objects/localhost.cfg
@@ -56,11 +54,12 @@ cfg_file=/etc/nagios/misccommands.cfg
 #cfg_dir=/etc/nagios/switches
 #cfg_dir=/etc/nagios/routers
 
+cfg_dif=/etc/nagios/commands
+cfg_dir=/etc/nagios/contacts
+cfg_dir=/etc/nagios/contactgroups
 cfg_dir=/etc/nagios/hosts
 cfg_dir=/etc/nagios/hostgroups
 cfg_dir=/etc/nagios/services
-cfg_dir=/etc/nagios/contacts
-cfg_dir=/etc/nagios/contactgroups
 cfg_dir=/etc/nagios/servicegroups
 cfg_dir=/etc/nagios/servicedeps
 
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 5cfa37287d..c6f78c3de5 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -82,6 +82,14 @@
   - config
   - nagios_server
 
+## Copy over the nagios configs
+- name: Copy /etc/nagios/*cfg files
+  copy: src=nagios/configs/{{ item }} dest=/etc/nagios/{{ item }}
+  with_items:
+    - escalations.cfg  
+    - minimal.cfg
+    - nagios.cfg
+    - timeperiods.cfg
 
 ## Copy over the command scripts
 - name: Copy /etc/nagios/commands
@@ -150,6 +158,11 @@
 
 
 ## Build template files
+# This one may go to being just a regular config file if we can make remote monitoring work
+- name: Template out the cgi.cfg 
+  template: src=nagios/configs/cgi.cfg.j2 dest=/etc/nagios/ mode=0644 owner=root group=root
+  tags:
+  - nagios_server
 
 - name: Override config.inc.php for the given environment
   template: src=nagios/config.inc.php.j2 dest=/usr/share/nagios/html/config.inc.php mode=0640 owner=root group=apache