diff --git a/files/systemd/override.conf b/files/systemd/override.conf
new file mode 100644
index 0000000..04c4e77
--- /dev/null
+++ b/files/systemd/override.conf
@@ -0,0 +1,8 @@
+# Ansible managed
+
+[Unit]
+StartLimitIntervalSec=6
+StartLimitBurst=10
+
+[Service]
+Restart=on-failure
diff --git a/handlers/main.yml b/handlers/main.yml
index 0e9a185..f5fdb7b 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,10 +1,7 @@
 ---
-- name: reload monit
-  ansible.builtin.service:
-    name: monit
-    state: reloaded
-
 - name: restart opensearch
-  ansible.builtin.service:
+  ansible.builtin.systemd:
     name: opensearch
+    daemon_reload: true
     state: restarted
+    enabled: true
diff --git a/tasks/main.yml b/tasks/main.yml
index 64e87c0..b3e6532 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -39,6 +39,13 @@
       replace: -Xmx{{ (ansible_memtotal_mb / 1024 * 0.5) | round | int }}g
   notify: restart opensearch
 
+- name: Copy systemd override
+  ansible.builtin.copy:
+    src: systemd/override.conf
+    dest: /etc/systemd/system/opensearch.service.d/
+    mode: "0644"
+  notify: restart opensearch
+
 - name: "Opensearch | Start opensearch"
   ansible.builtin.systemd:
     name: opensearch
@@ -46,15 +53,9 @@
     state: started
     daemon_reload: true
 
-- name: "Opensearch | Enable Monit monitoring"
-  ansible.builtin.template:
-    src: opensearch.monit.j2
-    dest: /etc/monit/conf-enabled/opensearch
-    mode: "0644"
-  notify: reload monit
-
 - name: "Opensearch | Copy update script"
   ansible.builtin.template:
     src: update-opensearch-plugins.j2
     dest: "/usr/local/bin/{{ opensearch_plugin_update_script }}"
     mode: "0755"
+
diff --git a/templates/opensearch.monit.j2 b/templates/opensearch.monit.j2
deleted file mode 100644
index 8555f06..0000000
--- a/templates/opensearch.monit.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-# {{ ansible_managed }}
-
-check process {{ opensearch_monit_service }} with pidfile /run/opensearch/opensearch.pid
-  start program = "/usr/sbin/service opensearch start"
-  stop program = "/usr/sbin/service opensearch stop"
-  if failed host {{ opensearch_network_host }} port {{ opensearch_http_port }} for 3 cycles then restart
-  if 5 restarts within 5 cycles then timeout