diff --git a/docker/omd-labs-sakuli/ansible_provision/coreconfig.yml b/docker/omd-labs-sakuli/ansible_provision/coreconfig.yml
deleted file mode 100644
index 3a1e5690..00000000
--- a/docker/omd-labs-sakuli/ansible_provision/coreconfig.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-- name: Configure core
-  gather_facts: False
-  hosts: all
-  tasks:
-    - name: pretask
-      include: pretasks.yml
-
-    - name: create tmp dir
-      command: "mkdir -p {{ OMD_ROOT }}/tmp"
-
-    - name: Core - eventhandler script
-      copy:
-        src: ./omd/local/lib/nagios/plugins/sakuli_screenshot_eventhandler.sh
-        dest: "{{ OMD_ROOT }}/local/lib/nagios/plugins/"
-        mode: 0775
-    - name: Core - eventhandler command
-      copy:
-        src: ./omd/etc/nagios/conf.d/sakuli_screenshot_eventhandler.cfg
-        dest: "{{ OMD_ROOT }}/etc/core/conf.d/"
-    - name: Core - logo directory
-      file:
-        path: "{{ OMD_ROOT }}/local/share/nagios/htdocs/images/logos/"
-        state: directory
-        recurse: yes
-    - name: Core - Sakuli logo
-      copy:
-        src: ./omd/local/share/nagios/htdocs/images/logos/sakuli.png
-        dest: "{{ OMD_ROOT }}/local/share/nagios/htdocs/images/logos/"
-    - name: Core - Sakuli templates
-      copy:
-        src: ./omd/etc/nagios/conf.d/sakuli_nagios_templates.cfg
-        dest: "{{ OMD_ROOT }}/etc/core/conf.d/"
-    - name: Escape HTML tags
-      lineinfile:
-        path: "{{ item }}"
-        regexp: '^escape_html_tags=\d$'
-        line: 'escape_html_tags=0'
-      ignore_errors: yes
-      with_items:
-        - "{{ OMD_ROOT }}/etc/core/cgi.cfg"
-        - "{{ OMD_ROOT }}/etc/thruk/cgi.cfg"
diff --git a/src/common/src/main/resources/org/sakuli/common/setup/omd/etc/nagios/conf.d/sakuli_nagios_objects.cfg b/src/common/src/main/resources/org/sakuli/common/setup/omd/etc/nagios/conf.d/sakuli_nagios_objects.cfg
deleted file mode 100644
index 7f1f023e..00000000
--- a/src/common/src/main/resources/org/sakuli/common/setup/omd/etc/nagios/conf.d/sakuli_nagios_objects.cfg
+++ /dev/null
@@ -1,96 +0,0 @@
-define service {
-  name                           tpl_s_sakuli_gearman
-  use                            generic-service,srv-pnp
-  active_checks_enabled          0
-  check_command                  check_dummy!3!'Did not receive any Sakuli result within 3 minutes.'
-  check_freshness                1
-  event_handler                  sakuli_screenshot_eventhandler
-  event_handler_enabled          1
-  freshness_threshold            180
-  icon_image                     sakuli.png
-  icon_image_alt                 Sakuli E2E test
-  notes                          Sakuli E2E results received by mod-gearman
-  passive_checks_enabled         1
-  is_volatile                    1
-  register                       0
-}
-
-define service {
-  name                           tpl_s_sakuli_gearman_grafana
-  use                            generic-service,srv-perf
-  active_checks_enabled          0
-  check_command                  check_dummy!3!'Did not receive any Sakuli result within 3 minutes.'
-  check_freshness                1
-  event_handler                  sakuli_screenshot_eventhandler
-  event_handler_enabled          1
-  freshness_threshold            180
-  icon_image                     sakuli.png
-  icon_image_alt                 Sakuli E2E test
-  notes                          Sakuli E2E results received by mod-gearman
-  passive_checks_enabled         1
-  is_volatile                    1
-  register                       0
-}
-
-#define service {
-#  service_description            omd_thruk
-#  host_name                      sakuli_client
-#  use                            tpl_s_sakuli_gearman
-#}
-#
-#
-#define service {
-#  service_description            example_xfce
-#  host_name                      sakuli_client
-#  use                            tpl_s_sakuli_gearman
-#}
-#
-#define service {
-#  service_description            example_windows7
-#  host_name                      sakuli_client
-#  use                            tpl_s_sakuli_gearman
-#}
-#
-#define service {
-#  service_description            example_windows8
-#  host_name                      sakuli_client
-#  use                            tpl_s_sakuli_gearman
-#}
-#
-#define service {
-#  service_description            example_ubuntu
-#  host_name                      sakuli_client
-#  use                            tpl_s_sakuli_gearman
-#}
-#
-#define service {
-#  service_description            example_centos
-#  host_name                      sakuli_client
-#  use                            tpl_s_sakuli_gearman
-#}
-#
-#define host {
-#  host_name                      sakuli_client
-#  alias                          Sakuli E2E client
-#  address                        127.0.0.1
-#  use                            generic-host
-#}
-
-
-# DB check_command for Sakuli
-# --name = Suite ID
-# --name2 = number of seconds the last result is allowed to be old
-define command {
-  command_name                   check_sakuli
-  command_line                   $USER1$/check_mysql_health \
-                                    --hostname=$USER16$ \
-                                    --database=$USER10$ \
-                                    --username=$USER11$ \
-                                    --password=$USER12$ \
-                                    --mode=my-sakuli-suite \
-                                    --name='$ARG1$' \
-                                    --name2=$ARG2$ \
-                                    --report=html \
-                                    --port=$USER13$ \
-                                    --with-mymodules-dyn-dir=$USER15$
-}
diff --git a/src/common/src/main/resources/org/sakuli/common/setup/omd/etc/nagios/conf.d/sakuli_nagios_templates.cfg b/src/common/src/main/resources/org/sakuli/common/setup/omd/etc/nagios/conf.d/sakuli_nagios_templates.cfg
index 38c6f258..2fb9159f 100644
--- a/src/common/src/main/resources/org/sakuli/common/setup/omd/etc/nagios/conf.d/sakuli_nagios_templates.cfg
+++ b/src/common/src/main/resources/org/sakuli/common/setup/omd/etc/nagios/conf.d/sakuli_nagios_templates.cfg
@@ -17,6 +17,7 @@ define service {
   notes                          Sakuli E2E results received by mod-gearman
   passive_checks_enabled         1
   is_volatile                    1
+  obsess_over_service            1
   flap_detection_enabled         0
   register                       0
 }