diff --git a/roles/cmp-rdbms/vars/database.yml b/roles/cmp-rdbms/vars/database.yml
index d3cd0479..cdfe9ce5 100644
--- a/roles/cmp-rdbms/vars/database.yml
+++ b/roles/cmp-rdbms/vars/database.yml
@@ -1,17 +1,19 @@
 # Helper variables
-_database_id:                     "svc-db-{{ database_type }}"
-_database_central_name:           "{{ applications | get_app_conf( _database_id, 'docker.services.' ~ database_type ~ '.name') }}"
-_database_consumer_entity_name:   "{{ database_application_id | get_entity_name }}"
-_database_central_enabled:        "{{ applications | get_app_conf(database_application_id, 'features.central_database', False) }}"
+_dbtype:                          "{{ (database_type | d('') | trim) }}"
+_database_id:                     "{{ ('svc-db-' ~ _dbtype) if _dbtype else '' }}"
+_database_central_name:           "{{ (applications | get_app_conf(_database_id, 'docker.services.' ~ _dbtype ~ '.name', False, '')) if _dbtype else '' }}"
+_database_consumer_entity_name:   "{{ (database_application_id | d(application_id)) | get_entity_name }}"
+_database_central_enabled:        "{{ (applications | get_app_conf(database_application_id, 'features.central_database', False)) if _dbtype else False }}"
 
 # Definition
+
 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"
+database_port:      "{{ (ports.localhost.database[_database_id] | d('')) if _dbtype else '' }}"
+database_env:       "{{docker_compose.directories.env}}{{ database_type }}.env"
 database_url_jdbc:  "jdbc:{{ database_type if database_type == 'mariadb' else 'postgresql' }}://{{ database_host }}:{{ database_port }}/{{ database_name }}"
-database_url_full:  "{{database_type}}://{{database_username}}:{{database_password}}@{{database_host}}:{{database_port}}/{{ database_name }}"
+database_url_full:  "{{ database_type }}://{{database_username}}:{{database_password}}@{{database_host}}:{{database_port}}/{{ database_name }}"
 database_volume:    "{{ _database_consumer_entity_name ~ '_' if not _database_central_enabled }}{{ database_host }}"