diff --git a/handlers/main.yml b/handlers/main.yml
index 2ed7da6..566ae4c 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,6 +4,7 @@
   service:
     name: '{{ "flexlm-" + item.name }}'
     state: '{{ "restarted" if (flexlm__deploy_state == "present" and (item.service | d(True)) else "stopped" }}'
+    enabled: '{{ item.service | d(True) | bool }}'
   with_flattened:
     - '{{ flexlm__licences }}'
 
diff --git a/tasks/main.yml b/tasks/main.yml
index 83c1495..67adbe9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -79,7 +79,6 @@
     group: 'root'
     mode: '0644'
   register: flexlm__register_service
-  notify: ['restart flexlm services']
   with_flattened:
     - '{{ flexlm__licences }}'
   when: ( (flexlm__deploy_state == "present") and
@@ -90,7 +89,6 @@
     dest: '{{ "/etc/systemd/system/flexlm-" + item.name + ".service" }}'
     state: absent
   register: flexlm__register_service
-  notify: ['restart flexlm services']
   with_flattened:
     - '{{ flexlm__licences }}'
   when: ( (flexlm__deploy_state == "absent") or
@@ -101,11 +99,3 @@
   notify: ['restart flexlm services']
   when: ( flexlm__register_service|changed )
 
-- name: Manage services
-  service:
-    name: '{{ "flexlm-" + item.name }}'
-    state: '{{ "started" if (flexlm__deploy_state == "present" and (item.service | d(True)) else "stopped" }}'
-    enabled: '{{ item.service | d(True) | bool }}'
-  with_flattened:
-    - '{{ flexlm__licences }}'
-