diff --git a/azure_crowd_dc_node.yml b/azure_crowd_dc_node.yml
index 0577798..2854ff0 100644
--- a/azure_crowd_dc_node.yml
+++ b/azure_crowd_dc_node.yml
@@ -17,7 +17,7 @@
       - "Environment=JDBC_URL={{ atl_jdbc_url }}"
 
     atl_jdbc_encoding: 'UNICODE'
-    atl_jdbc_collation: 'Latin1_General_CS_AS'
+    atl_jdbc_collation: "{{ 'C' if atl_db_engine == 'rds_postgres' else 'Latin1_General_CS_AS' }}"
     atl_jdbc_ctype: 'C'
     atl_jdbc_template: 'template0'
 
diff --git a/group_vars/azure_node_local.yml b/group_vars/azure_node_local.yml
index 306328a..728834c 100644
--- a/group_vars/azure_node_local.yml
+++ b/group_vars/azure_node_local.yml
@@ -1,4 +1,4 @@
 atl_jdbc_query_params_for_engine:
   rds_postgres: "?sslmode=require"
-atl_db_root_user_login: "{{ atl_db_root_user+'@'+atl_db_host if atl_db_host is search('postgres.database.azure.com') else atl_db_root_user }}"
-atl_jdbc_user_login: "{{ atl_jdbc_user+'@'+atl_db_host if atl_db_host is search('postgres.database.azure.com') else atl_jdbc_user }}"
\ No newline at end of file
+atl_db_root_user_login: "{{ atl_db_root_user+'@'+atl_db_host if atl_db_engine == 'rds_postgres' else atl_db_root_user }}"
+atl_jdbc_user_login: "{{ atl_jdbc_user+'@'+atl_db_host if atl_db_engine == 'rds_postgres' else atl_jdbc_user }}"
\ No newline at end of file