diff --git a/files/monit/mta-sts-daemon b/files/monit/mta-sts-daemon
deleted file mode 100644
index 5fa28a1..0000000
--- a/files/monit/mta-sts-daemon
+++ /dev/null
@@ -1,9 +0,0 @@
-# Managed by Ansible
-
-check process mta-sts-daemon
-  matching "/usr/bin/python3 /usr/bin/mta-sts-daemon"
-  group mailserver
-  start program = "/usr/sbin/service postfix-mta-sts-resolver start"
-  stop program = "/usr/sbin/service postfix-mta-sts-resolver stop"
-  if 2 restarts within 3 cycles then timeout
-  if failed host 127.0.0.1 port 8461 for 3 cycles then restart
diff --git a/files/monit/postfix b/files/monit/postfix
deleted file mode 100644
index c963980..0000000
--- a/files/monit/postfix
+++ /dev/null
@@ -1,7 +0,0 @@
-# Managed by Ansible
-
-check process postfix with pidfile /var/spool/postfix/pid/master.pid
-  group mailserver
-  start program = "/usr/sbin/service postfix@- start"
-  stop program = "/usr/sbin/service postfix@- stop"
-  if failed port 25 protocol smtp with timeout 15 seconds for 3 cycles then restart
diff --git a/files/systemd/override.conf b/files/systemd/override.conf
new file mode 100644
index 0000000..bf45b90
--- /dev/null
+++ b/files/systemd/override.conf
@@ -0,0 +1,4 @@
+# Ansible managed
+
+[Service]
+Restart=always
diff --git a/handlers/main.yml b/handlers/main.yml
index 9761c78..e2225a6 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,6 +4,10 @@
     name: rsyslog
     state: restarted
 
+- name: Reload systemd
+  ansible.builtin.systemd:
+    daemon_reload: true
+
 - name: reload postfix
   ansible.builtin.service:
     name: postfix
@@ -14,11 +18,6 @@
     name: postfix
     state: restarted
 
-- name: reload monit
-  ansible.builtin.service:
-    name: monit
-    state: reloaded
-
 - name: Get certificate
   command: dehydrated --cron -g
   delegate_to: "{{ gateway_host }}"
diff --git a/tasks/monitoring.yml b/tasks/monitoring.yml
index e33f3b3..16f879f 100644
--- a/tasks/monitoring.yml
+++ b/tasks/monitoring.yml
@@ -1,20 +1,4 @@
 ---
-- name: "Monitoring | Enable Monit monitoring for Postfix"
-  ansible.builtin.copy:
-    src: monit/postfix
-    dest: /etc/monit/conf-enabled/postfix
-    mode: "0644"
-  notify: reload monit
-  when: "'monit' in ansible_facts.packages"
-
-- name: "Monitoring | Enable Monit Monitoring for MTA-STS"
-  ansible.builtin.copy:
-    src: monit/mta-sts-daemon
-    dest: /etc/monit/conf-enabled/mta-sts-daemon
-    mode: "0644"
-  notify: reload monit
-  when: "'monit' in ansible_facts.packages and postfix_type == 'internet'"
-
 - name: "Monitoring | Setup cron job for pflogsum"
   ansible.builtin.cron:
     name: "Daily pflogsum statistics"
diff --git a/tasks/postfix.yml b/tasks/postfix.yml
index 0b9b4c1..8097275 100644
--- a/tasks/postfix.yml
+++ b/tasks/postfix.yml
@@ -79,3 +79,12 @@
     path: "{{ postfix_dhparam_file }}"
     size: 4096
   when: postfix_type == "internet"
+
+- name: "Postfix | Copy systemd override"
+  ansible.builtin.copy:
+    src: systemd/override.conf
+    dest: /etc/systemd/postfix@-.service.d/override.conf
+    mode: "0644"
+  notify:
+    - Reload systemd
+    - restart postfix