diff --git a/tasks/oracle/install_checkmk_plugins_oracle.yml b/tasks/oracle/install_checkmk_plugins_oracle.yml
index 3124287215e47d334f5a5b0291919e8ed48a01da..f0371bb1c32f534233fbf8b0112cd40353e45fa9 100644
--- a/tasks/oracle/install_checkmk_plugins_oracle.yml
+++ b/tasks/oracle/install_checkmk_plugins_oracle.yml
@@ -1,22 +1,29 @@
 ---
-- name: delete legacy directory for self-developed Check_MK plugins (they were in the wrong location)
+- name: >
+    delete legacy directory for self-developed Check_MK plugins (they were in
+    the wrong location)
   ansible.builtin.file:
     path: "/usr/lib/check_mk_agent/nrpe"
     state: absent
 
 - name: delete legacy plugins
   ansible.builtin.file:
-    path: "/usr/lib/check_mk_agent/local/3600/check_oracle_db_table_integrity.sh"
+    path: "/usr/lib/check_mk_agent/{{ item }}"
     state: absent
+  loop:
+    - "local/3600/check_oracle_db_table_integrity.sh"
+    # https://checkmk.com/werk/13732
+    - "plugins/mk_oracle"
 
-- name: create directory for self-developed Check_MK plugins
+- name: create directories for self-developed and OTB Check_MK plugins
   ansible.builtin.file:
-    path: "/usr/lib/check_mk_agent/local/{{ item }}/"
+    path: "/usr/lib/check_mk_agent/{{ item }}/"
     state: directory
-    mode: "0755"
+    mode: "0o755"
   loop:
-    - "3600"
-    - "43200"
+    - "local/3600"
+    - "local/43200"
+    - "plugins/60"
 
 - name: install self-developed Check_MK plugins for Oracle
   ansible.builtin.copy:
@@ -24,7 +31,7 @@
     dest: "/usr/lib/check_mk_agent/local/{{ item }}"
     owner: "root"
     group: "root"
-    mode: "0750"
+    mode: "0o750"
   loop:
     - "3600/check_oracle_db_segment_size.sh"
     - "43200/check_oracle_db_table_integrity.sh"
@@ -51,14 +58,18 @@
 # latest version
 - name: install vendor Check_MK plugins for Oracle
   ansible.builtin.get_url:
-    url: "https://cmk.slub-dresden.de/slubmon/check_mk/agents/plugins/{{ item }}"
-    dest: "/usr/lib/check_mk_agent/plugins/"
+    url: "https://cmk.slub-dresden.de/slubmon/check_mk/agents/plugins/{{ item.u }}"
+    dest: "/usr/lib/check_mk_agent/plugins/{{ item.d }}"
     owner: "root"
     group: "root"
     mode: "0755"
   loop:
-    - "mk_oracle"
+    # https://docs.checkmk.com/master/en/monitoring_oracle.html#_plug_in_and_configuration_paths
+    # https://checkmk.com/werk/13732
+    - u: "mk_oracle"
+      d: "60/"
 
+# https://docs.checkmk.com/master/en/monitoring_oracle.html#user_config
 - name: configure vendor Check_MK plugin for Oracle
   ansible.builtin.lineinfile:
     path: "/etc/check_mk/mk_oracle.cfg"
diff --git a/tasks/oracle/main_oracle.yml b/tasks/oracle/main_oracle.yml
index f8821df2aec2bd4c32d0efcbf9e689d6ce39cdd9..60a41eb752aa1f64f94b51af10441283cb6613ca 100644
--- a/tasks/oracle/main_oracle.yml
+++ b/tasks/oracle/main_oracle.yml
@@ -24,3 +24,6 @@
 - name: install cleanup jobs
   ansible.builtin.import_tasks: "oracle/install_cleanup_jobs.yml"
   tags: [oracle, cleanup, log, alertlog]
+- name: Install Check_MK plugins for Oracle databases
+  ansible.builtin.import_tasks: "oracle/install_checkmk_plugins_oracle.yml"
+  tags: [cmk, checkmk, check-mk, check_mk, monitoring]