diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 8770b3c..5cc8d2d 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -1,6 +1,21 @@
 configs:
   rally:
-    openstack_release: mitaka
+    tempest:
+      openstack_release: mitaka
+      compute:
+        min_compute_nodes: 2
+      compute_feature:
+        block_migration_for_live_migration: false
+        live_migration: false
+        nova_cert: false
+        personality: true
+      network_feature:
+        ipv6: false
+        ipv6_subnet_attributes: false
+      object_storage_feature:
+        discoverability: false
+      volume:
+        storage_protocol: ceph
 
 sources:
   openstack/rally:
diff --git a/service/files/tempest.conf.j2 b/service/files/tempest.conf.j2
index a287007..0402630 100644
--- a/service/files/tempest.conf.j2
+++ b/service/files/tempest.conf.j2
@@ -1,21 +1,26 @@
-[network-feature-enabled]
-ipv6_subnet_attributes = false
-ipv6 = false
-
 [compute]
 min_microversion = 2.1
+{% if rally.tempest.openstack_release == "mitaka" %}
+max_microversion = 2.25
+{% elif rally.tempest.openstack_release == "newton" %}
 max_microversion = 2.38
-min_compute_nodes = 2
+{% endif %}
+min_compute_nodes = {{ rally.tempest.compute.min_compute_nodes }}
 
-[volume]
-build_timeout = 300
-storage_protocol = ceph
+{% set compute_feature = rally.tempest.compute_feature %}
+[compute-feature-enabled]
+block_migration_for_live_migration = {{ compute_feature.block_migration_for_live_migration }}
+live_migration = {{ compute_feature.live_migration }}
+nova_cert = {{ compute_feature.nova_cert }}
+personality = {{ compute_feature.personality }}
+
+{% set network_feature = rally.tempest.network_feature %}
+[network-feature-enabled]
+ipv6 = {{ network_feature.ipv6 }}
+ipv6_subnet_attributes = {{ network_feature.ipv6_subnet_attributes }}
 
 [object-storage-feature-enabled]
-discoverability = false
+discoverability = {{ rally.tempest.object_storage_feature.discoverability }}
 
-[compute-feature-enabled]
-nova_cert = false
-personality = true
-block_migration_for_live_migration = false
-live_migration = true
+[volume]
+storage_protocol = {{ rally.tempest.volume.storage_protocol }}