diff --git a/jira_dc_upgrade_node.yml b/jira_dc_upgrade_node.yml
index 09da5ad..6cd35ab 100644
--- a/jira_dc_upgrade_node.yml
+++ b/jira_dc_upgrade_node.yml
@@ -12,9 +12,14 @@
 
     atl_startup_systemd_params:
       - "LimitNOFILE=16384"
-  
+
+  pre_tasks:
+    - name: stop jira
+      service:
+        name: "{{ atl_systemd_service_name }}"
+        state: stopped
+
   roles:
-    - role: product_stop
     - role: product_common
     - role: product_install
     - role: jira_config
diff --git a/roles/product_stop/defaults/main.yml b/roles/product_stop/defaults/main.yml
deleted file mode 100644
index 45d6f8a..0000000
--- a/roles/product_stop/defaults/main.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-
-# Mostly for molecule testing, as skip-tags doesn't work with handlers.
-atl_startup_enable: true
-atl_startup_restart: "{{ lookup('env', 'ATL_STARTUP_RESTART') or true }}"
-
-atl_startup_script_map:
-  jira: "bin/start-jira.sh"
-  confluence: "bin/start-confluence.sh"
-  stash: "bin/start-bitbucket.sh"
-  crowd: "start_crowd.sh"
-
-atl_startup_exec_path: "{{ atl_product_installation_current }}/{{ atl_startup_script_map[atl_product_family] }}"
-atl_startup_exec_options: ["-fg"]
-atl_startup_systemd_params: []
-
-atl_systemd_service_name: "{{ atl_product_edition }}.service"
-
-atl_systemd_service_target: "multi-user.target"
diff --git a/roles/product_stop/tasks/main.yml b/roles/product_stop/tasks/main.yml
deleted file mode 100644
index c9a2cf5..0000000
--- a/roles/product_stop/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: stop {{ atl_product_family }} {{ atl_product_edition}}
-  service:
-    name: "{{ atl_systemd_service_name }}"
-    state: stopped