diff --git a/azure_crowd_dc_node.yml b/azure_crowd_dc_node.yml
index 0577798..5bbdb02 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 }}"
+      - "Environment=JDBC_USER={{ atl_jdbc_user_login }}"
       - "Environment=JDBC_PASSWORD={{ atl_jdbc_password }}"
       - "Environment=JDBC_URL={{ atl_jdbc_url }}"
 
     atl_jdbc_encoding: 'UNICODE'
-    atl_jdbc_collation: 'Latin1_General_CS_AS'
+    atl_jdbc_collation: 'C'
     atl_jdbc_ctype: 'C'
     atl_jdbc_template: 'template0'
 
diff --git a/inv/az_node_local b/inv/azure_node_local
similarity index 100%
rename from inv/az_node_local
rename to inv/azure_node_local
diff --git a/roles/crowd_config/tasks/main.yml b/roles/crowd_config/tasks/main.yml
index 464e686..9ead178 100644
--- a/roles/crowd_config/tasks/main.yml
+++ b/roles/crowd_config/tasks/main.yml
@@ -123,7 +123,7 @@
     positional_args:
       - "{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}{{ atl_tomcat_contextpath }}/crowd"
   when:
-    - atl_db_engine == "postgres"
+    - atl_db_engine == "rds_postgres"
     - atl_proxy_name is defined
     - atl_tomcat_scheme is defined
     - db_created is undefined or not db_created.changed