diff --git a/icinga2/server.sls b/icinga2/server.sls
index 64d8e25..d31e153 100644
--- a/icinga2/server.sls
+++ b/icinga2/server.sls
@@ -31,10 +31,11 @@ icingaweb2_vhost:
     - watch_by:
       - service: nginx
 
-/etc/icinga2/conf.d:
+/etc/icinga2:
   git.cloned:
-    - name: ssh://keiran5@git.keiran.us:9022/config-mgmt/icinga2-conf.d.git
-    - target: /etc/icinga2/conf.d
+    - name: ssh://keiran5@git.keiran.us:9022/config-mgmt/icinga2-conf.git
+    - user: nagios
+    - target: /etc/icinga2
 
 # icingacli setup config directory
 # icingacli setup token create
diff --git a/icinga2/ssh_client.sls b/icinga2/ssh_client.sls
index 39c6a8a..96604f3 100644
--- a/icinga2/ssh_client.sls
+++ b/icinga2/ssh_client.sls
@@ -46,6 +46,3 @@ nagios:
     - template: jinja
     - source: salt://icinga2/files/client_sudo.jinja
     - check_cmd: /usr/sbin/visudo -c -f
-
-# FIXME
-# [2023-12-06 00:13:41 -0500] warning/PluginNotificationTask: Notification command for object 'usfn-ovh!nvme0' (PID: 12270, arguments: '/etc/icinga2/scripts/mail-service-notification.sh') terminated with exit code 127, output: /etc/icinga2/scripts/mail-service-notification.sh: 20: /etc/icinga2/scripts/mail-service-notification.sh: mail: not found