diff --git a/keystone/templates/configmap-etc.yaml b/keystone/templates/configmap-etc.yaml
index cf9d4ff8..89a1c908 100644
--- a/keystone/templates/configmap-etc.yaml
+++ b/keystone/templates/configmap-etc.yaml
@@ -36,7 +36,7 @@ metadata:
   name: keystone-etc
 data:
   rally_tests.yaml: |+
-{{- tuple .Values.conf.rally_tests "etc/_rally_tests.yaml.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
+{{ toYaml .Values.conf.rally_tests.tests | indent 4 }}
   keystone.conf: |+
 {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.keystone | indent 4 }}
   keystone-paste.ini: |+
diff --git a/keystone/templates/etc/_rally_tests.yaml.tpl b/keystone/templates/etc/_rally_tests.yaml.tpl
deleted file mode 100644
index 26b515c9..00000000
--- a/keystone/templates/etc/_rally_tests.yaml.tpl
+++ /dev/null
@@ -1,201 +0,0 @@
----
-KeystoneBasic.add_and_remove_user_role:
-- context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.authenticate_user_and_validate_token:
-- args: {}
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_add_and_list_user_roles:
-- context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_and_delete_ec2credential:
-- context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_and_delete_role:
-- runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_and_delete_service:
-- args:
-    description: test_description
-    service_type: Rally_test_type
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_and_get_role:
-- args: {}
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_and_list_ec2credentials:
-- context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_and_list_services:
-- args:
-    description: test_description
-    service_type: Rally_test_type
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_and_list_tenants:
-- args: {}
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_and_list_users:
-- args: {}
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_delete_user:
-- args: {}
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_tenant:
-- args: {}
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_tenant_with_users:
-- args:
-    users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_update_and_delete_tenant:
-- args: {}
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_user:
-- args: {}
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_user_set_enabled_and_delete:
-- args:
-    enabled: true
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-- args:
-    enabled: false
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.create_user_update_password:
-- args: {}
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-KeystoneBasic.get_entities:
-- runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
diff --git a/keystone/values.yaml b/keystone/values.yaml
index da75a113..715e2744 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -114,11 +114,11 @@ dependencies:
 
 pod:
   affinity:
-      anti:
-        type:
-          default: preferredDuringSchedulingIgnoredDuringExecution
-        topologyKey:
-          default: kubernetes.io/hostname
+    anti:
+      type:
+        default: preferredDuringSchedulingIgnoredDuringExecution
+      topologyKey:
+        default: kubernetes.io/hostname
   mounts:
     keystone_db_init:
       init_container: null
@@ -498,8 +498,207 @@ conf:
     identity:get_domain_config_default: rule:admin_required
   rally_tests:
     run_tempest: false
-    override:
-    append:
+    tests:
+      KeystoneBasic.add_and_remove_user_role:
+      - context:
+          users:
+            tenants: 1
+            users_per_tenant: 1
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.authenticate_user_and_validate_token:
+      - args: {}
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_add_and_list_user_roles:
+      - context:
+          users:
+            tenants: 1
+            users_per_tenant: 1
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_and_delete_ec2credential:
+      - context:
+          users:
+            tenants: 1
+            users_per_tenant: 1
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_and_delete_role:
+      - runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_and_delete_service:
+      - args:
+          description: test_description
+          service_type: Rally_test_type
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_and_get_role:
+      - args: {}
+        context:
+          users:
+            tenants: 1
+            users_per_tenant: 1
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_and_list_ec2credentials:
+      - context:
+          users:
+            tenants: 1
+            users_per_tenant: 1
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_and_list_services:
+      - args:
+          description: test_description
+          service_type: Rally_test_type
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_and_list_tenants:
+      - args: {}
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_and_list_users:
+      - args: {}
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_delete_user:
+      - args: {}
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_tenant:
+      - args: {}
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_tenant_with_users:
+      - args:
+          users_per_tenant: 1
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_update_and_delete_tenant:
+      - args: {}
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_user:
+      - args: {}
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_user_set_enabled_and_delete:
+      - args:
+          enabled: true
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      - args:
+          enabled: false
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.create_user_update_password:
+      - args: {}
+        runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
+      KeystoneBasic.get_entities:
+      - runner:
+          concurrency: 1
+          times: 1
+          type: constant
+        sla:
+          failure_rate:
+            max: 0
   mpm_event:
     override:
     append: