diff --git a/roles/monitoring-master/files/users.conf b/roles/monitoring-master/files/users.conf
new file mode 100644
index 0000000..da95f73
--- /dev/null
+++ b/roles/monitoring-master/files/users.conf
@@ -0,0 +1,21 @@
+object User "michy" {
+  import "generic-user"
+
+  display_name = "Michy Monitoring"
+  groups =  []
+
+  email = "spamsink@atlantishq.de"
+}
+
+object User "icingaadmin" {
+  import "generic-user"
+
+  display_name = "Icinga 2 Admin"
+  groups = [ "icingaadmins" ]
+
+  email = "HISTORY_PURGED_SECRET"
+}
+
+object UserGroup "icingaadmins" {
+  display_name = "Icinga 2 Admin Group"
+}
diff --git a/roles/monitoring-master/tasks/icinga.yaml b/roles/monitoring-master/tasks/icinga.yaml
index c1477ff..086c312 100644
--- a/roles/monitoring-master/tasks/icinga.yaml
+++ b/roles/monitoring-master/tasks/icinga.yaml
@@ -86,6 +86,7 @@
     - services_passive.conf
     - services_passive_mail_extern.conf
     - services_async.conf
+    - users.conf
     - async-icinga-services-dynamic.conf
   notify:
     - restart icinga