diff --git a/ansible/roles/olm/handlers/main.yaml b/ansible/roles/olm/handlers/main.yaml
index d807b42..810b159 100644
--- a/ansible/roles/olm/handlers/main.yaml
+++ b/ansible/roles/olm/handlers/main.yaml
@@ -2,4 +2,3 @@
   service:
     name: olm
     state: restarted
-    daemon_reload: true
diff --git a/ansible/roles/olm/tasks/main.yaml b/ansible/roles/olm/tasks/main.yaml
index e274534..297ccfd 100644
--- a/ansible/roles/olm/tasks/main.yaml
+++ b/ansible/roles/olm/tasks/main.yaml
@@ -39,4 +39,18 @@
     owner: root
     group: root
     mode: '0600'
+  register: olm_service
   notify: restart olm
+
+- name: systemctl daemon-reload to pickup olm service changes
+  systemd_service:
+    daemon_reload: true
+  when: olm_service.changed
+  notify: restart olm
+
+- name: Start and enable olm service
+  service:
+    name: olm
+    state: started
+    enabled: true
+    daemon_reload: true