diff --git a/aws_confluence_dc_node.yml b/aws_confluence_dc_node.yml
index 74b239b..daaf8ea 100644
--- a/aws_confluence_dc_node.yml
+++ b/aws_confluence_dc_node.yml
@@ -16,3 +16,4 @@
     - role: product_install
     - role: database_init
     - role: confluence_config
+    - role: product_startup
diff --git a/aws_jira_dc_node.yml b/aws_jira_dc_node.yml
index fed1016..790a881 100644
--- a/aws_jira_dc_node.yml
+++ b/aws_jira_dc_node.yml
@@ -16,4 +16,4 @@
     - role: product_install
     - role: database_init
     - role: jira_config
-    - role: jira_startup
+    - role: product_startup
diff --git a/roles/jira_startup/handlers/main.yml b/roles/jira_startup/handlers/main.yml
deleted file mode 100644
index 601ee6d..0000000
--- a/roles/jira_startup/handlers/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-
-- name: Restart Jira
-  service: name=jira.service state=restarted
-
-- name: Enable Jira
-  command: systemctl enable jira.service
diff --git a/roles/jira_startup/tasks/main.yml b/roles/jira_startup/tasks/main.yml
deleted file mode 100644
index 13b7f1e..0000000
--- a/roles/jira_startup/tasks/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-
-- name: Install Jira service file
-  template:
-    src: jira.service.j2
-    dest: /etc/systemd/system/jira.service
-  notify:
-    - Enable Jira
-    - Restart Jira
-
diff --git a/roles/product_startup/defaults/main.yml b/roles/product_startup/defaults/main.yml
new file mode 100644
index 0000000..dd0baa5
--- /dev/null
+++ b/roles/product_startup/defaults/main.yml
@@ -0,0 +1,8 @@
+---
+
+atl_startup_script_map:
+  jira: "start-jira.sh"
+  confluence: "start-confluence.sh"
+  stash: "start-bitbucket.sh"
+
+atl_systemd_service_name: "{{ atl_product_edition }}.service"
diff --git a/roles/product_startup/handlers/main.yml b/roles/product_startup/handlers/main.yml
new file mode 100644
index 0000000..0497a44
--- /dev/null
+++ b/roles/product_startup/handlers/main.yml
@@ -0,0 +1,9 @@
+---
+
+- name: Restart Product
+  service:
+    name: "{{ atl_systemd_service_name }}"
+    stat: restarted
+
+- name: Enable Jira
+  command: systemctl enable "{{ atl_systemd_service_name }}"
diff --git a/roles/product_startup/tasks/main.yml b/roles/product_startup/tasks/main.yml
new file mode 100644
index 0000000..4922627
--- /dev/null
+++ b/roles/product_startup/tasks/main.yml
@@ -0,0 +1,9 @@
+---
+
+- name: "Install systemd service file"
+  template:
+    src: "product.service.j2"
+    dest: "/etc/systemd/system/{{ atl_systemd_service_name }}"
+  notify:
+    - Enable Product
+    - Restart Product
diff --git a/roles/jira_startup/templates/jira.service.j2 b/roles/product_startup/templates/product.service.j2
similarity index 51%
rename from roles/jira_startup/templates/jira.service.j2
rename to roles/product_startup/templates/product.service.j2
index cccd046..c64de87 100644
--- a/roles/jira_startup/templates/jira.service.j2
+++ b/roles/product_startup/templates/product.service.j2
@@ -1,12 +1,12 @@
 [Unit]
-Description=Atlassian Jira
+Description=Atlassian {{ atl_product_edition }}
 After=network-online.target
 
 [Service]
 User={{ atl_product_user }}
 Group={{ atl_product_user }}
 
-ExecStart={{ atl_product_installation_current }}/bin/start-jira.sh -fg
+ExecStart={{ atl_product_installation_current }}/bin/{{ atl_startup_script_map[atl_product_family] }} -fg
 Restart=on-failure
 
 [Install]