diff --git a/aws_confluence_synchrony_node.yml b/aws_confluence_synchrony_node.yml
index 6733d42..1fb6834 100644
--- a/aws_confluence_synchrony_node.yml
+++ b/aws_confluence_synchrony_node.yml
@@ -9,6 +9,14 @@
     atl_product_user: "confluence"
     atl_product_edition: "confluence"
 
+    atl_startup_systemd_params:
+      - "EnvironmentFile=/etc/atl"
+      - "EnvironmentFile=/etc/atl.synchrony"
+      - "WorkingDirectory={{ atl_product_installation_current }}/logs/"
+    atl_startup_exec_options: []
+    atl_startup_exec_path: "{{ atl_installation_base }}/bin/start-synchrony"
+    atl_systemd_service_name: "synchrony.service"
+
   roles:
     - role: linux_common
     - role: aws_common
@@ -16,5 +24,5 @@
     - role: product_common
     - role: product_install
     - role: confluence_common
-    # Synchrony is 12-factor, so configuration in the startup
-    - role: synchrony_startup
+    - role: synchrony_config
+    - role: product_startup
diff --git a/roles/synchrony_startup/defaults/main.yml b/roles/synchrony_config/defaults/main.yml
similarity index 100%
rename from roles/synchrony_startup/defaults/main.yml
rename to roles/synchrony_config/defaults/main.yml
diff --git a/roles/synchrony_startup/files/start-synchrony b/roles/synchrony_config/files/start-synchrony
similarity index 100%
rename from roles/synchrony_startup/files/start-synchrony
rename to roles/synchrony_config/files/start-synchrony
diff --git a/roles/synchrony_startup/tasks/main.yml b/roles/synchrony_config/tasks/main.yml
similarity index 58%
rename from roles/synchrony_startup/tasks/main.yml
rename to roles/synchrony_config/tasks/main.yml
index 562742b..330fe6d 100644
--- a/roles/synchrony_startup/tasks/main.yml
+++ b/roles/synchrony_config/tasks/main.yml
@@ -6,8 +6,6 @@
     dest: "{{ atl_installation_base }}/bin/start-synchrony"
     group: "{{ atl_product_user }}"
     mode: "0750"
-  notify:
-    - Restart Synchrony
 
 - name: Install the Synchrony environment settings
   template:
@@ -15,13 +13,3 @@
     dest: "/etc/atl.synchrony"
     group: "{{ atl_product_user }}"
     mode: "0640"    
-  notify:
-    - Restart Synchrony
-
-- name: "Install Synchrony service file"
-  template:
-    src: "synchrony.service.j2"
-    dest: "/etc/systemd/system/synchrony.service"
-  notify:
-    - Enable Synchrony
-    - Restart Synchrony
diff --git a/roles/synchrony_startup/templates/atl.synchrony.j2 b/roles/synchrony_config/templates/atl.synchrony.j2
similarity index 100%
rename from roles/synchrony_startup/templates/atl.synchrony.j2
rename to roles/synchrony_config/templates/atl.synchrony.j2
diff --git a/roles/synchrony_startup/handlers/main.yml b/roles/synchrony_startup/handlers/main.yml
deleted file mode 100644
index 8f393c9..0000000
--- a/roles/synchrony_startup/handlers/main.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Restart Synchrony
-  service:
-    name: synchrony.service
-    state: restarted
-
-- name: Enable Synchrony
-  command: systemctl enable synchrony.service
diff --git a/roles/synchrony_startup/templates/synchrony.service.j2 b/roles/synchrony_startup/templates/synchrony.service.j2
deleted file mode 100644
index b64440d..0000000
--- a/roles/synchrony_startup/templates/synchrony.service.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Atlassian Synchrony Server
-After=network-online.target
-
-[Service]
-User={{ atl_product_user }}
-Group={{ atl_product_user }}
-
-EnvironmentFile=/etc/atl
-EnvironmentFile=/etc/atl.synchrony
-WorkingDirectory={{ atl_product_installation_current }}/logs/
-ExecStart={{ atl_installation_base }}/bin/start-synchrony
-
-Restart=on-failure
-
-[Install]
-WantedBy=multi-target.target