diff --git a/collectd/files/dbi.conf b/collectd/files/dbi.conf
index 547ccfc..6628b93 100644
--- a/collectd/files/dbi.conf
+++ b/collectd/files/dbi.conf
@@ -10,8 +10,8 @@
 LoadPlugin dbi
 
 <Plugin dbi>
-{%- for query in collectd_settings.plugins.dbi.queries  %}
-  <Query {{ query.name }}>
+{%- for name, query in collectd_settings.plugins.dbi.queries.items() | sort  %}
+  <Query {{ name }}>
     Statement "{{ query.statement }}"
       {%- for res in query.results %}
     <Result>
@@ -30,8 +30,8 @@ LoadPlugin dbi
   </Query>
 {%- endfor %}
 
-{%- for db in collectd_settings.plugins.dbi.databases %}
-  <Database {{ db.name }}>
+{%- for name, db in collectd_settings.plugins.dbi.databases.items() | sort %}
+  <Database {{ name }}>
     Driver {{ db.driver }}
   {%- for driverOption in db.driverOptions %}
     DriverOption "{{ driverOption.name }}" {{ driverOption.value }}
diff --git a/collectd/files/mysql.conf b/collectd/files/mysql.conf
index 9296d67..a8f3fad 100644
--- a/collectd/files/mysql.conf
+++ b/collectd/files/mysql.conf
@@ -11,8 +11,8 @@ LoadPlugin mysql
 
 <Plugin mysql>
 
-{% for db in collectd_settings.plugins.mysql.databases %}
-      <Database "{{ db.name }}">
+{% for name, db in collectd_settings.plugins.mysql.databases.items() | sort %}
+      <Database "{{ name }}">
               Host "{{ db.host }}"
 {%- if db.port is defined and db.port %}
               Port "{{ db.port }}"
diff --git a/pillar.example b/pillar.example
index 5320f53..428e4a3 100644
--- a/pillar.example
+++ b/pillar.example
@@ -39,7 +39,7 @@ collectd:
           pass: pass
     dbi:
       queries:
-        - name: mysql_user_connections
+        mysql_user_connections:
           statement: SELECT user, count(*) as nof_connections FROM information_schema.processlist GROUP BY user
           results:
             - type: gauge
@@ -47,7 +47,7 @@ collectd:
               instancesFrom: user
               valuesFrom: nof_connections
       databases:
-        - name: name
+        name:
           driver: mysql
           queries:
             - mysql_user_connections
@@ -72,14 +72,14 @@ collectd:
       password: 'password'
     mysql:
       databases:
-        - host: 'foo'
+        mydb:
+          host: 'foo'
           port: '3306'
           user: 'myuser'
           pass: 'mypass'
-          name: 'mydb'
           masterstats: true
-        - host: 'foo'
-          name: 'mydb'
+        mydb:
+          host: 'foo'
           socket: '/var/run/mysql/mysqld.sock'
           slavestats: true
           slavenotifications: true