diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 4e01fbb..9f5d758 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -1,4 +1,6 @@
 configs:
-    db_max_timeout: 60
-    db_root_password: password
-    mariadb_port: 3306
+  db:
+    max_timeout: 60
+    root_password: password
+  mariadb:
+    port: 3306
diff --git a/service/files/mariadb-bootstrap.sh.j2 b/service/files/mariadb-bootstrap.sh.j2
index fe96fe3..8f08460 100644
--- a/service/files/mariadb-bootstrap.sh.j2
+++ b/service/files/mariadb-bootstrap.sh.j2
@@ -23,8 +23,8 @@ function bootstrap_db {
     wait $(jobs -p)
 }
 
-DB_ROOT_PASSWORD="{{ db_root_password }}"
-DB_MAX_TIMEOUT="{{ db_max_timeout }}"
+DB_ROOT_PASSWORD="{{ db.root_password }}"
+DB_MAX_TIMEOUT="{{ db.max_timeout }}"
 
 # Only update permissions if permissions need to be updated
 if [[ $(stat -c %U:%G /var/lib/mysql) != "mysql:mysql" ]]; then
diff --git a/service/files/my.cnf.j2 b/service/files/my.cnf.j2
index 3039a98..a5eb514 100644
--- a/service/files/my.cnf.j2
+++ b/service/files/my.cnf.j2
@@ -1,6 +1,6 @@
 [mysqld]
 bind-address = {{ network_topology["private"]["address"] }}
-port = {{ mariadb_port }}
+port = {{ mariadb.port }}
 
 datadir=/var/lib/mysql/
 log-error=/var/log/ccp/mysql/mysql.log
diff --git a/service/files/readiness.sh.j2 b/service/files/readiness.sh.j2
index c2176fe..4744413 100644
--- a/service/files/readiness.sh.j2
+++ b/service/files/readiness.sh.j2
@@ -1,3 +1,3 @@
 #!/bin/bash -e
 
-test -f /tmp/mariadb_ok && nc -z {{ network_topology["private"]["address"] }} {{ mariadb_port }}
+test -f /tmp/mariadb_ok && nc -z {{ network_topology["private"]["address"] }} {{ mariadb.port }}
diff --git a/service/mariadb.yaml b/service/mariadb.yaml
index 3b48ddc..822a1f4 100644
--- a/service/mariadb.yaml
+++ b/service/mariadb.yaml
@@ -1,7 +1,7 @@
 service:
   name: mariadb
   ports:
-    - {{ mariadb_port }}
+    - {{ mariadb.port }}
   containers:
     - name: mariadb
       image: mariadb