diff --git a/roles/docker-mariadb/tasks/main.yml b/roles/docker-mariadb/tasks/main.yml
index 2771689a..c53e7975 100644
--- a/roles/docker-mariadb/tasks/main.yml
+++ b/roles/docker-mariadb/tasks/main.yml
@@ -59,7 +59,7 @@
 
 - name: "Create database user: {{ database_username }}"
   mysql_user:
-    name: "{{database_username}}"
+    name:     "{{database_username}}"
     password: "{{database_password}}"
     host: "%"
     priv: '{{database_name}}.*:ALL'
diff --git a/roles/docker-mariadb/vars/configuration.yml b/roles/docker-mariadb/vars/configuration.yml
new file mode 100644
index 00000000..1afc22d3
--- /dev/null
+++ b/roles/docker-mariadb/vars/configuration.yml
@@ -0,0 +1,2 @@
+version:  "latest"
+hostname: "central-mariadb"
\ No newline at end of file
diff --git a/roles/docker-mariadb/vars/main.yml b/roles/docker-mariadb/vars/main.yml
index c94f14d2..db039a4a 100644
--- a/roles/docker-mariadb/vars/main.yml
+++ b/roles/docker-mariadb/vars/main.yml
@@ -1,3 +1 @@
-version:        "latest"
-application_id: "mariadb"
-hostname:       "central-{{application_id}}"
+application_id: "mariadb"
\ No newline at end of file
diff --git a/roles/docker-postgres/vars/configuration.yml b/roles/docker-postgres/vars/configuration.yml
index 4fc992c5..03192774 100644
--- a/roles/docker-postgres/vars/configuration.yml
+++ b/roles/docker-postgres/vars/configuration.yml
@@ -1,2 +1,3 @@
 # Please set an version in your inventory file - Rolling release for postgres isn't recommended
-version: "latest"
\ No newline at end of file
+version:  "latest"
+hostname: "central-postgres"
\ No newline at end of file
diff --git a/roles/docker-postgres/vars/main.yml b/roles/docker-postgres/vars/main.yml
index 759a85b4..5a8695b0 100644
--- a/roles/docker-postgres/vars/main.yml
+++ b/roles/docker-postgres/vars/main.yml
@@ -1,2 +1 @@
-application_id: postgres
-hostname:       central-postgres
\ No newline at end of file
+application_id: postgres
\ No newline at end of file