diff --git a/ubuntu/roles/icinga-client/files/restart.conf b/ubuntu/roles/icinga-client/files/restart.conf
new file mode 100644
index 0000000..eedb19c
--- /dev/null
+++ b/ubuntu/roles/icinga-client/files/restart.conf
@@ -0,0 +1,2 @@
+[Service]
+Restart=on-failure
diff --git a/ubuntu/roles/icinga-client/tasks/main.yml b/ubuntu/roles/icinga-client/tasks/main.yml
index 27b96ae..34439e7 100644
--- a/ubuntu/roles/icinga-client/tasks/main.yml
+++ b/ubuntu/roles/icinga-client/tasks/main.yml
@@ -10,7 +10,16 @@
   with_items:
      - icinga2
      - monitoring-plugins
+- name: Ensure icinga2 systemd folder exists
+  file:
+    path: /etc/systemd/system/icinga2.service.d/
+    state: directory
+- name: Copy custom icinga2 systemd service file modifications
+  copy:
+    src: restart.conf
+    dest: /etc/systemd/system/icinga2.service.d/restart.conf
 - name: Ensure that icinga2 systemd service is enabled
   systemd:
     name: icinga2
     enabled: yes
+    daemon_reload: yes