diff --git a/roles/cmp-rdbms/vars/database.yml b/roles/cmp-rdbms/vars/database.yml
index bf715529..d3cd0479 100644
--- a/roles/cmp-rdbms/vars/database.yml
+++ b/roles/cmp-rdbms/vars/database.yml
@@ -5,10 +5,10 @@ _database_consumer_entity_name:   "{{ database_application_id | get_entity_name
 _database_central_enabled:        "{{ applications | get_app_conf(database_application_id, 'features.central_database', False) }}"
 
 # Definition
-database_name:      "{{ applications | get_app_conf( database_application_id, 'database.name', false, _database_consumer_entity_name ) }}"                      # The overwritte configuration is needed by bigbluebutton
-database_instance:  "{{ _database_central_name if _database_central_enabled else database_name }}"                                                              # This could lead to bugs at dedicated database @todo cleanup
-database_host:      "{{ _database_central_name if _database_central_enabled else 'database' }}"                                                                 # This could lead to bugs at dedicated database @todo cleanup
-database_username:  "{{ applications | get_app_conf(database_application_id, 'database.username', false, _database_consumer_entity_name)}}"                     # The overwritte configuration is needed by bigbluebutton
+database_name:      "{{ _database_consumer_entity_name }}"
+database_instance:  "{{ _database_central_name if _database_central_enabled else database_name }}" # This could lead to bugs at dedicated database @todo cleanup
+database_host:      "{{ _database_central_name if _database_central_enabled else 'database' }}"    # This could lead to bugs at dedicated database @todo cleanup
+database_username:  "{{ _database_consumer_entity_name }}"
 database_password:  "{{ applications | get_app_conf(database_application_id, 'credentials.database_password', true) }}"
 database_port:      "{{ ports.localhost.database[ _database_id ] }}"
 database_env:       "{{docker_compose.directories.env}}{{database_type}}.env"
diff --git a/roles/web-app-bigbluebutton/config/main.yml b/roles/web-app-bigbluebutton/config/main.yml
index 9820eb9c..930ea344 100644
--- a/roles/web-app-bigbluebutton/config/main.yml
+++ b/roles/web-app-bigbluebutton/config/main.yml
@@ -1,7 +1,4 @@
 enable_greenlight:    "true"
-database:
-  name:               "multiple_databases"
-  username:           "postgres2"
 api_suffix:           "/bigbluebutton/"
 features:
   matomo:             true
diff --git a/roles/web-app-bigbluebutton/tasks/main.yml b/roles/web-app-bigbluebutton/tasks/main.yml
index f9e996b9..973adbbc 100644
--- a/roles/web-app-bigbluebutton/tasks/main.yml
+++ b/roles/web-app-bigbluebutton/tasks/main.yml
@@ -2,11 +2,9 @@
 - name: "For '{{ application_id }}': include docker-compose role"
   include_role:
     name: cmp-docker-proxy
-  vars:
-    database_instance:  "{{ application_id }}"
-    database_password:  "{{ applications | get_app_conf(application_id, 'credentials.postgresql_secret', True) }}"
-    database_username:  "postgres"
-    database_name:      ""                              # Multiple databases
+
+- name: "include seed-database-to-backup.yml"
+  include_tasks: "{{ playbook_dir }}/roles/sys-bkp-docker-2-loc/tasks/seed-database-to-backup.yml"
 
 - name: configure websocket_upgrade.conf
   copy: 
diff --git a/roles/web-app-bigbluebutton/vars/main.yml b/roles/web-app-bigbluebutton/vars/main.yml
index c2521197..fd510f23 100644
--- a/roles/web-app-bigbluebutton/vars/main.yml
+++ b/roles/web-app-bigbluebutton/vars/main.yml
@@ -1,15 +1,18 @@
-application_id:                           "web-app-bigbluebutton"
+application_id:                     "web-app-bigbluebutton"
 
 # Database configuration
-database_type:                            "postgres"
-database_password:                        "{{ applications | get_app_conf(application_id, 'credentials.postgresql_secret') }}"
+database_type:                      "postgres"
+database_instance:                  "{{ application_id | get_entity_name }}"
+database_password:                  "{{ applications | get_app_conf(application_id, 'credentials.postgresql_secret', True) }}"
+database_username:                  "postgres"
+database_name:                      ""                              # Multiple databases
 
 # Proxy
-domain:                                   "{{ domains | get_domain(application_id) }}"
-http_port:                                "{{ ports.localhost.http[application_id] }}"
+domain:                             "{{ domains | get_domain(application_id) }}"
+http_port:                          "{{ ports.localhost.http[application_id] }}"
 
 # Docker
-docker_compose_skipp_file_creation:       true # Handled in this role
-docker_repository_address:                "https://github.com/bigbluebutton/docker.git"
-docker_pull_git_repository:               true
-docker_compose_flush_handlers:            false
\ No newline at end of file
+docker_compose_skipp_file_creation: true # Handled in this role
+docker_repository_address:          "https://github.com/bigbluebutton/docker.git"
+docker_pull_git_repository:         true
+docker_compose_flush_handlers:      false
\ No newline at end of file