diff --git a/azure_crowd_dc_node.yml b/azure_crowd_dc_node.yml
index 5bbdb02..0577798 100644
--- a/azure_crowd_dc_node.yml
+++ b/azure_crowd_dc_node.yml
@@ -12,12 +12,12 @@
     atl_startup_systemd_params:
       - "Environment=JDBC_DRIVER={{ atl_db_driver }}"
       - "Environment=JDBC_DIALECT={{atl_jdbc_dialect}}"
-      - "Environment=JDBC_USER={{ atl_jdbc_user_login }}"
+      - "Environment=JDBC_USER={{ atl_jdbc_user }}"
       - "Environment=JDBC_PASSWORD={{ atl_jdbc_password }}"
       - "Environment=JDBC_URL={{ atl_jdbc_url }}"
 
     atl_jdbc_encoding: 'UNICODE'
-    atl_jdbc_collation: 'C'
+    atl_jdbc_collation: 'Latin1_General_CS_AS'
     atl_jdbc_ctype: 'C'
     atl_jdbc_template: 'template0'
 
diff --git a/roles/product_startup/molecule/bitbucket/tests/test_default.py b/roles/product_startup/molecule/bitbucket/tests/test_default.py
index 8bec4b7..066728b 100644
--- a/roles/product_startup/molecule/bitbucket/tests/test_default.py
+++ b/roles/product_startup/molecule/bitbucket/tests/test_default.py
@@ -7,7 +7,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 
 def test_service_file(host):
-    f = host.file('/usr/lib/systemd/system/bitbucket.service')
+    f = host.file('/lib/systemd/system/bitbucket.service')
     assert f.contains("^ExecStart=/opt/atlassian/bitbucket/current/bin/start-bitbucket.sh -fg --no-search$")
     assert f.contains("^UMask=0027$")
     assert f.contains("^LimitNOFILE=4096$")
diff --git a/roles/product_startup/molecule/default/tests/test_default.py b/roles/product_startup/molecule/default/tests/test_default.py
index 3ef51d9..2675e00 100644
--- a/roles/product_startup/molecule/default/tests/test_default.py
+++ b/roles/product_startup/molecule/default/tests/test_default.py
@@ -7,7 +7,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 
 def test_service_file(host):
-    f = host.file('/usr/lib/systemd/system/jira-software.service')
+    f = host.file('/lib/systemd/system/jira-software.service')
     assert f.contains("^ExecStart=/opt/atlassian/jira-software/current/bin/start-jira.sh -fg$")
     assert f.user == 'root'
     assert f.group == 'root'
diff --git a/roles/product_startup/molecule/synchrony/tests/test_default.py b/roles/product_startup/molecule/synchrony/tests/test_default.py
index 5451915..5e21f1f 100644
--- a/roles/product_startup/molecule/synchrony/tests/test_default.py
+++ b/roles/product_startup/molecule/synchrony/tests/test_default.py
@@ -7,7 +7,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
 
 
 def test_service_file(host):
-    f = host.file('/usr/lib/systemd/system/synchrony.service')
+    f = host.file('/lib/systemd/system/synchrony.service')
     assert f.contains("^ExecStart=/opt/atlassian/bin/start-synchrony$")
     assert f.contains("^EnvironmentFile=/etc/atl$")
     assert f.contains("^EnvironmentFile=/etc/atl.synchrony$")
diff --git a/roles/product_startup/tasks/main.yml b/roles/product_startup/tasks/main.yml
index d65e9d3..5dbd7e9 100644
--- a/roles/product_startup/tasks/main.yml
+++ b/roles/product_startup/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 
 - name: "Set the systemd_dir"
   set_fact:
@@ -5,12 +6,12 @@
 
 - name: "systemd_dir debug"
   debug:
-    msg: "systemd_dir {{systemd_dir}}"
+    msg: "systemd_dir {{ systemd_dir }}"
 
 - name: "Install systemd service file"
   template:
     src: "product.service.j2"
-    dest: "{{systemd_dir}}/{{ atl_systemd_service_name }}"
+    dest: "{{ systemd_dir }}/{{ atl_systemd_service_name }}"
     owner: root
     group: root
     mode: 0640