diff --git a/nailgun/nailgun/objects/openstack_config.py b/nailgun/nailgun/objects/openstack_config.py
index bf97622d3f..f6e5ac02da 100644
--- a/nailgun/nailgun/objects/openstack_config.py
+++ b/nailgun/nailgun/objects/openstack_config.py
@@ -104,7 +104,7 @@ class OpenstackConfigCollection(NailgunCollection):
         """
         configs_query = cls.filter_by(
             None, cluster_id=cluster.id, is_active=True)
-        configs_query = configs_query.order_by(cls.single.model.node_role)
+        configs_query = configs_query.order_by(cls.single.model.created_at)
 
         node_ids = set(n.id for n in nodes)
         node_roles = set()
diff --git a/nailgun/nailgun/test/unit/test_stages_task_serialization.py b/nailgun/nailgun/test/unit/test_stages_task_serialization.py
index 0b0f0dd487..11faa060a5 100644
--- a/nailgun/nailgun/test/unit/test_stages_task_serialization.py
+++ b/nailgun/nailgun/test/unit/test_stages_task_serialization.py
@@ -313,7 +313,7 @@ class TestHooksSerializers(BaseTaskSerializationTest):
                     'DEFAULT/param_b': {'value': 'value_cinder'}
                 },
                 'keystone_config': {
-                    'DEFAULT/param_a': {'value': 'value_compute'},
+                    'DEFAULT/param_a': {'value': 'value_cinder'},
                 }
             }})