diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml
index b67485b..9f7e184 100644
--- a/group_vars/aws_node_local.yml
+++ b/group_vars/aws_node_local.yml
@@ -103,7 +103,8 @@ atl_db_type: "{{ atl_db_engine_to_db_type_map[atl_db_engine] | default('postgres
 
 atl_jdbc_db_name: "{{ lookup('env', 'ATL_JDBC_DB_NAME') }}"
 atl_jdbc_user: "{{ lookup('env', 'ATL_JDBC_USER') }}"
-atl_jdbc_password: "{{ lookup('env', 'ATL_JDBC_PASSWORD') }}"
+#atl_jdbc_password: "{{ lookup('env', 'ATL_JDBC_PASSWORD') }}"
+atl_jdbc_password_secret: "{{ lookup ('env', 'ATL_DB_JDBC_PASSWORD_SECRET_NAME') }}"
 atl_jdbc_encoding: "{{ lookup('env', 'ATL_JDBC_ENCODING') or 'UTF-8' }}"
 atl_jdbc_collation: "{{ lookup('env', 'ATL_JDBC_COLLATION') or 'en_US.UTF-8' }}"
 atl_jdbc_ctype: "{{ lookup('env', 'ATL_JDBC_CTYPE') or 'en_US.UTF-8' }}"
diff --git a/roles/confluence_config/templates/confluence.cfg.xml.j2 b/roles/confluence_config/templates/confluence.cfg.xml.j2
index b6e78ba..b15e3ce 100644
--- a/roles/confluence_config/templates/confluence.cfg.xml.j2
+++ b/roles/confluence_config/templates/confluence.cfg.xml.j2
@@ -16,7 +16,7 @@
     <property name="hibernate.connection.driver_class">{{ atl_db_driver }}</property>
     <property name="hibernate.connection.url">{{ atl_jdbc_url }}</property>
     <property name="hibernate.connection.username">{{ atl_jdbc_user }}</property>
-    <property name="hibernate.connection.password">{{ atl_jdbc_password | replace("&", "&amp;") }}</property>
+    <property name="hibernate.connection.password">{{ (lookup('aws_secret',atl_jdbc_password_secret, region=atl_aws_region) | from_json | json_query('password')) }}</property>
     <property name="hibernate.c3p0.min_size">{{ atl_db_poolminsize }}</property>
     <property name="hibernate.c3p0.max_size">{{ atl_db_poolmaxsize }}</property>
     <property name="hibernate.c3p0.timeout">{{ atl_db_timeout }}</property>
diff --git a/roles/database_init/tasks/main.yml b/roles/database_init/tasks/main.yml
index c4a7c88..5d314f0 100644
--- a/roles/database_init/tasks/main.yml
+++ b/roles/database_init/tasks/main.yml
@@ -11,7 +11,7 @@
     login_password: "{{ (lookup('aws_secret',atl_db_root_password_secret, region=atl_aws_region) | from_json | json_query('password')) }}"
     port: "{{ atl_db_port }}"
     name: "{{ atl_jdbc_user }}"
-    password: "{{ atl_jdbc_password }}"
+    password: "{{ (lookup('aws_secret',atl_jdbc_password_secret, region=atl_aws_region) | from_json | json_query('password')) }}"
     expires: 'infinity'
 
 - name: Collect dbcluster db_names