diff --git a/handlers/main.yml b/handlers/main.yml
index 455be4a..0ca09d1 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -24,3 +24,8 @@
   ansible.builtin.systemd:
     name: zammad*
     state: restarted
+
+- name: restart opensearch
+  ansible.builtin.service:
+    name: opensearch
+    state: restarted
diff --git a/tasks/opensearch.yml b/tasks/opensearch.yml
index c546168..a359f1a 100644
--- a/tasks/opensearch.yml
+++ b/tasks/opensearch.yml
@@ -26,6 +26,18 @@
     dest: /etc/opensearch/opensearch.yml
     mode: 0644
 
+- name: "Opensearch | Setze empfohlene Optionen"
+  ansible.builtin.replace:
+    path: /etc/opensearch/jvm.options
+    regexp: "{{ item.regexp }}"
+    replace: "{{ item.replace }}"
+  loop:
+    - regexp: '^-Xms[0-9]*g$'
+      replace: -Xms{{ (ansible_memtotal_mb / 1024 * 0.5) | round | int }}g
+    - regexp: '^-Xmx[0-9]*g$'
+      replace: -Xmx{{ (ansible_memtotal_mb / 1024 * 0.5) | round | int }}g
+  notify: restart opensearch
+
 - name: "Opensearch | Starte Opensearch-Dienst"
   ansible.builtin.systemd:
     name: opensearch