diff --git a/roles/cmp-db-docker/tasks/main.yml b/roles/cmp-db-docker/tasks/main.yml
index bb1417c2..635a3adf 100644
--- a/roles/cmp-db-docker/tasks/main.yml
+++ b/roles/cmp-db-docker/tasks/main.yml
@@ -7,8 +7,8 @@
 - name: "For '{{ application_id }}': Load database variables"
   include_vars: "{{ item }}"
   loop:
-    - "{{ DOCKER_VARS_FILE }}"            # Important to load docker variables first so that database can use them
-    - "{{ cmp_db_docker_vars_file_db }}"  # Important to load them before docker role so that backup can use them
+    - "{{ DOCKER_VARS_FILE }}"    # Important to load docker variables first so that database can use them
+    - "{{ DATABASE_VARS_FILE }}"  # Important to load them before docker role so that backup can use them
 
 - name: "For '{{ application_id }}': Load central RDBMS"
   include_role:
diff --git a/roles/cmp-db-docker/vars/main.yml b/roles/cmp-db-docker/vars/main.yml
index f12a3674..0a12743f 100644
--- a/roles/cmp-db-docker/vars/main.yml
+++ b/roles/cmp-db-docker/vars/main.yml
@@ -1 +1 @@
-cmp_db_docker_vars_file_db: "{{ playbook_dir }}/roles/cmp-rdbms/vars/database.yml"
\ No newline at end of file
+DATABASE_VARS_FILE: "{{ playbook_dir }}/roles/cmp-rdbms/vars/database.yml"
\ No newline at end of file
diff --git a/roles/web-app-pgadmin/tasks/configuration.yml b/roles/web-app-pgadmin/tasks/configuration.yml
index 40ce084c..884bd5be 100644
--- a/roles/web-app-pgadmin/tasks/configuration.yml
+++ b/roles/web-app-pgadmin/tasks/configuration.yml
@@ -1,5 +1,5 @@
-- name: "load variables from {{ cmp_db_docker_vars_file_db }}"
-  include_vars: "{{ cmp_db_docker_vars_file_db }}"
+- name: "load variables from {{ DATABASE_VARS_FILE }}"
+  include_vars: "{{ DATABASE_VARS_FILE }}"
 
 - name: "loading database configuration variables"
   include_vars: