diff --git a/roles/product_startup/defaults/main.yml b/roles/product_startup/defaults/main.yml
index dee6aae..1b01331 100644
--- a/roles/product_startup/defaults/main.yml
+++ b/roles/product_startup/defaults/main.yml
@@ -1,8 +1,7 @@
 ---
 
-# Mostly for molecule testing, as skip-tags doesn't work with handlers.
+# Mostly for molecule testing, as skip-tags doesn't in all cases
 atl_startup_enable: true
-atl_startup_restart: true
 
 atl_startup_script_map:
   jira: "start-jira.sh"
@@ -13,5 +12,4 @@ atl_startup_exec_path: "{{ atl_product_installation_current }}/bin/{{ atl_startu
 atl_startup_exec_options: ["-fg"]
 atl_startup_systemd_params: []
 
-
 atl_systemd_service_name: "{{ atl_product_edition }}.service"
diff --git a/roles/product_startup/handlers/main.yml b/roles/product_startup/handlers/main.yml
deleted file mode 100644
index ecf2a75..0000000
--- a/roles/product_startup/handlers/main.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-
-- name: Restart Product
-  service:
-    name: "{{ atl_systemd_service_name }}"
-    state: restarted
-  when: atl_startup_restart
-
-- name: Enable Product
-  service:
-    name: "{{ atl_systemd_service_name }}"
-    enabled: true
-  when: atl_startup_enable
diff --git a/roles/product_startup/molecule/bitbucket/playbook.yml b/roles/product_startup/molecule/bitbucket/playbook.yml
index 84d25ae..ac13eab 100644
--- a/roles/product_startup/molecule/bitbucket/playbook.yml
+++ b/roles/product_startup/molecule/bitbucket/playbook.yml
@@ -16,7 +16,6 @@
       - "--no-search"
 
     atl_startup_enable: false
-    atl_startup_restart: false
 
   pre_tasks:
     - name: Create systemd dir if necessary
diff --git a/roles/product_startup/molecule/default/playbook.yml b/roles/product_startup/molecule/default/playbook.yml
index ba24ddc..b38907f 100644
--- a/roles/product_startup/molecule/default/playbook.yml
+++ b/roles/product_startup/molecule/default/playbook.yml
@@ -7,7 +7,6 @@
     atl_product_edition: "jira-software"
 
     atl_startup_enable: false
-    atl_startup_restart: false
 
   pre_tasks:
     - name: Create systemd dir if necessary
diff --git a/roles/product_startup/molecule/synchrony/playbook.yml b/roles/product_startup/molecule/synchrony/playbook.yml
index d848712..71a6a95 100644
--- a/roles/product_startup/molecule/synchrony/playbook.yml
+++ b/roles/product_startup/molecule/synchrony/playbook.yml
@@ -15,7 +15,6 @@
     atl_systemd_service_name: "synchrony.service"
 
     atl_startup_enable: false
-    atl_startup_restart: false
 
   pre_tasks:
     - name: Create systemd dir if necessary
diff --git a/roles/product_startup/tasks/main.yml b/roles/product_startup/tasks/main.yml
index 4922627..8726e3f 100644
--- a/roles/product_startup/tasks/main.yml
+++ b/roles/product_startup/tasks/main.yml
@@ -4,6 +4,10 @@
   template:
     src: "product.service.j2"
     dest: "/etc/systemd/system/{{ atl_systemd_service_name }}"
-  notify:
-    - Enable Product
-    - Restart Product
+
+- name: Enable and start Product
+  service:
+    name: "{{ atl_systemd_service_name }}"
+    state: started
+    enabled: true
+  when: atl_startup_enable