diff --git a/roles/docker-central-database/vars/database.yml b/roles/docker-central-database/vars/database.yml
index eb19dfa0..7c18daaa 100644
--- a/roles/docker-central-database/vars/database.yml
+++ b/roles/docker-central-database/vars/database.yml
@@ -4,5 +4,5 @@ database_name:      "{{ application_id }}"
 database_username:  "{{ application_id }}"
 database_port:      "{{ 3306 if database_type == 'mariadb' else 5432 }}"
 database_env:       "{{docker_compose.directories.env}}{{database_type}}.env"
-
-# Don't set application_id . It would conflict with central database logic
\ No newline at end of file
+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 }}"
\ No newline at end of file
diff --git a/roles/docker-funkwhale/templates/env.j2 b/roles/docker-funkwhale/templates/env.j2
index 6aea719c..05102b04 100644
--- a/roles/docker-funkwhale/templates/env.j2
+++ b/roles/docker-funkwhale/templates/env.j2
@@ -118,4 +118,4 @@ LDAP_ROOT_DN        =   "{{ldap.dn.root}}"
 
 FUNKWHALE_FRONTEND_PATH=/srv/funkwhale/front/dist
 
-DATABASE_URL = postgresql://{{database_username}}:{{database_password}}@{{database_host}}:{{database_port}}/{{ database_name }}
\ No newline at end of file
+DATABASE_URL = {{ database_url_full }}
\ No newline at end of file
diff --git a/roles/docker-keycloak/templates/env.j2 b/roles/docker-keycloak/templates/env.j2
index 87eabad0..bc548616 100644
--- a/roles/docker-keycloak/templates/env.j2
+++ b/roles/docker-keycloak/templates/env.j2
@@ -13,7 +13,7 @@ KC_METRICS_ENABLED=             true
 KEYCLOAK_ADMIN=                 "{{applications.keycloak.users.administrator.username}}"
 KEYCLOAK_ADMIN_PASSWORD=        "{{applications.keycloak.administrator_password}}"
 KC_DB=                          postgres
-KC_DB_URL=                      jdbc:postgresql://{{database_host}}/{{database_name}}
+KC_DB_URL=                      {{database_url_jdbc}}
 KC_DB_USERNAME=                 {{database_username}}
 KC_DB_PASSWORD=                 {{database_password}}
 
diff --git a/roles/docker-openproject/templates/env.j2 b/roles/docker-openproject/templates/env.j2
index bed758c3..bc2095a0 100644
--- a/roles/docker-openproject/templates/env.j2
+++ b/roles/docker-openproject/templates/env.j2
@@ -11,7 +11,7 @@ OPENPROJECT_HOST__NAME={{domains[application_id]}}
 OPENPROJECT_RAILS__RELATIVE__URL__ROOT=
 IMAP_ENABLED=false
 POSTGRES_PASSWORD="{{ database_password }}"
-DATABASE_URL="postgres://{{ database_username }}:{{ database_password }}@{{database_host}}/{{database_name}}?pool=20&encoding=unicode&reconnect=true"
+DATABASE_URL="{{ database_url_full }}?pool=20&encoding=unicode&reconnect=true"
 RAILS_MIN_THREADS=4
 RAILS_MAX_THREADS=16
 OPENPROJECT_HSTS=true