diff --git a/roles/monitoring-master/files/services_passive.conf b/roles/monitoring-master/files/services_passive.conf
new file mode 100644
index 0000000..9d6990b
--- /dev/null
+++ b/roles/monitoring-master/files/services_passive.conf
@@ -0,0 +1,49 @@
+apply Service "systemd" {
+    import "remote_passive"
+    assign where host.vars.remote
+}
+
+apply Service "disk-remote" {
+    import "remote_passive"
+    assign where host.vars.remote
+}
+
+apply Service "load-remote" {
+    import "remote_passive"
+    assign where host.vars.remote
+}
+
+apply Service "skillbird-plugin" {
+    import "remote_passive"
+ 	assign where host.name == "steam"
+}
+
+apply Service "insurgency-1" {
+    import "remote_passive"
+ 	assign where host.name == "steam"
+}
+
+apply Service "insurgency-2" {
+    import "remote_passive"
+ 	assign where host.name == "steam"
+}
+
+apply Service "irc" {
+    import "remote_passive"
+ 	assign where host.name == "irc"
+}
+
+apply Service "darknet-rudi" {
+    import "remote_passive"
+ 	assign where host.name == "vpn"
+}
+
+apply Service "darknet-hase" {
+    import "remote_passive"
+ 	assign where host.name == "vpn"
+}
+
+apply Service "darknet-routes" {
+    import "remote_passive"
+ 	assign where host.name == "vpn"
+}
diff --git a/roles/monitoring-master/files/services_passive_mail_extern.conf b/roles/monitoring-master/files/services_passive_mail_extern.conf
new file mode 100644
index 0000000..8c83ae5
--- /dev/null
+++ b/roles/monitoring-master/files/services_passive_mail_extern.conf
@@ -0,0 +1,15 @@
+apply Service "MAIL-postfix-tls" {
+	import "generic-service"
+	check_command = "ssl"
+	vars.ssl_address = "mail.atlantishq.de"
+	vars.ssl_port = "465"
+ 	assign where host.name == "mail"
+}
+
+apply Service "IMAP-dovecot-tls" {
+	import "generic-service"
+	check_command = "ssl"
+	vars.ssl_address = "mail.atlantishq.de"
+	vars.ssl_port = "993"
+ 	assign where host.name == "mail"
+}
diff --git a/roles/monitoring-master/tasks/main.yaml b/roles/monitoring-master/tasks/main.yaml
index d456dc3..2a2a2d1 100644
--- a/roles/monitoring-master/tasks/main.yaml
+++ b/roles/monitoring-master/tasks/main.yaml
@@ -15,3 +15,11 @@
     src: send_nsca
     dest: /bin/send_nsca
     mode: 0755
+
+- name: Copy icinga hosts conf
+  copy:
+    src: icinga_master_hosts.conf
+    dest: /etc/icinga2/conf.d/
+    owner: root
+    group: nagios
+    mode: 0640