diff --git a/README.md b/README.md
index 415aa45..5d3dee4 100644
--- a/README.md
+++ b/README.md
@@ -32,18 +32,22 @@ bmcPort: 443
 bmcScheme: https
 username: admin
 password: password
-model: "Standard PC (Q35 + ICH9, 2009)"
 firmwareVersion: "1.0.0"
-powerState: "On"
 biosVersion: "1.0.0"
-biosSettingNoRebootKey: "AssetTag"
-biosSettingNoRebootValue: "compat-test-06"
-biosSettingNoRebootBaselineValue: "compat-base"
-biosSettingRebootKey: "BootMode"
-biosSettingRebootValue: "Bios"
-biosSettingRebootBaselineValue: "Uefi"
-bmcSettingKey: "EmailAlert.1.Address"
-bmcSettingValue: "alerts@example.com"
+01-bmc-registration:
+  model: "Standard PC (Q35 + ICH9, 2009)"
+  powerState: "On"
+06-biossettings-noreboot:
+  key: "AssetTag"
+  value: "compat-test-06"
+  baselineValue: "compat-base"
+07-biossettings-reboot:
+  key: "BootMode"
+  value: "Bios"
+  baselineValue: "Uefi"
+08-bmcsettings:
+  key: "EmailAlert.1.Address"
+  value: "alerts@example.com"
 ```
 
 Adjust the credentials and expectations to your respective values and point the tests to it:
diff --git a/infra/kind/values-basic-go.yaml b/infra/kind/values-basic-go.yaml
index 79ffe6c..0e57169 100644
--- a/infra/kind/values-basic-go.yaml
+++ b/infra/kind/values-basic-go.yaml
@@ -3,6 +3,7 @@ bmcPort: 8000
 bmcScheme: http
 username: foo
 password: bar
-model: "15G Monolithic"
 firmwareVersion: "7.10.30.00"
-powerState: "On"
+01-bmc-registration:
+  model: "15G Monolithic"
+  powerState: "On"
diff --git a/infra/kind/values-contoso-go.yaml b/infra/kind/values-contoso-go.yaml
index ad118fa..329782a 100644
--- a/infra/kind/values-contoso-go.yaml
+++ b/infra/kind/values-contoso-go.yaml
@@ -3,6 +3,7 @@ bmcPort: 8000
 bmcScheme: http
 username: foo
 password: bar
-model: "Joo Janta 200"
 firmwareVersion: "1.45.455b66-rev4"
-powerState: "On"
+01-bmc-registration:
+  model: "Joo Janta 200"
+  powerState: "On"
diff --git a/tests/01-bmc-registration/chainsaw-test.yaml b/tests/01-bmc-registration/chainsaw-test.yaml
index 5289fcb..0e8e569 100644
--- a/tests/01-bmc-registration/chainsaw-test.yaml
+++ b/tests/01-bmc-registration/chainsaw-test.yaml
@@ -31,6 +31,6 @@ spec:
                 name: (join('-', ['compatibility', $namespace]))
               status:
                 state: Enabled
-                model: ($values.model)
+                model: ($values."01-bmc-registration".model)
                 firmwareVersion: ($values.firmwareVersion)
-                powerState: ($values.powerState)
+                powerState: ($values."01-bmc-registration".powerState)
diff --git a/tests/06-biossettings-noreboot/biossettings-baseline.yaml b/tests/06-biossettings-noreboot/biossettings-baseline.yaml
index 6d1f034..997988f 100644
--- a/tests/06-biossettings-noreboot/biossettings-baseline.yaml
+++ b/tests/06-biossettings-noreboot/biossettings-baseline.yaml
@@ -12,4 +12,4 @@ spec:
   settingsFlow:
     - name: noreboot
       priority: 1
-      settings: (from_items([[($values.biosSettingNoRebootKey), ($values.biosSettingNoRebootBaselineValue)]]))
+      settings: (from_items([[($values."06-biossettings-noreboot".key), ($values."06-biossettings-noreboot".baselineValue)]]))
diff --git a/tests/06-biossettings-noreboot/biossettings-noreboot.yaml b/tests/06-biossettings-noreboot/biossettings-noreboot.yaml
index 578360e..03cf628 100644
--- a/tests/06-biossettings-noreboot/biossettings-noreboot.yaml
+++ b/tests/06-biossettings-noreboot/biossettings-noreboot.yaml
@@ -12,4 +12,4 @@ spec:
   settingsFlow:
     - name: noreboot
       priority: 1
-      settings: (from_items([[($values.biosSettingNoRebootKey), ($values.biosSettingNoRebootValue)]]))
+      settings: (from_items([[($values."06-biossettings-noreboot".key), ($values."06-biossettings-noreboot".value)]]))
diff --git a/tests/07-biossettings-reboot/biossettings-baseline.yaml b/tests/07-biossettings-reboot/biossettings-baseline.yaml
index 526c6b0..be8f201 100644
--- a/tests/07-biossettings-reboot/biossettings-baseline.yaml
+++ b/tests/07-biossettings-reboot/biossettings-baseline.yaml
@@ -10,4 +10,4 @@ spec:
   settingsFlow:
     - name: reboot
       priority: 1
-      settings: (from_items([[($values.biosSettingRebootKey), ($values.biosSettingRebootBaselineValue)]]))
+      settings: (from_items([[($values."07-biossettings-reboot".key), ($values."07-biossettings-reboot".baselineValue)]]))
diff --git a/tests/07-biossettings-reboot/biossettings-reboot.yaml b/tests/07-biossettings-reboot/biossettings-reboot.yaml
index 5e90f0d..2836220 100644
--- a/tests/07-biossettings-reboot/biossettings-reboot.yaml
+++ b/tests/07-biossettings-reboot/biossettings-reboot.yaml
@@ -10,4 +10,4 @@ spec:
   settingsFlow:
     - name: reboot
       priority: 1
-      settings: (from_items([[($values.biosSettingRebootKey), ($values.biosSettingRebootValue)]]))
+      settings: (from_items([[($values."07-biossettings-reboot".key), ($values."07-biossettings-reboot".value)]]))
diff --git a/tests/08-bmcsettings/bmcsettings.yaml b/tests/08-bmcsettings/bmcsettings.yaml
index f8bd25b..ca637b6 100644
--- a/tests/08-bmcsettings/bmcsettings.yaml
+++ b/tests/08-bmcsettings/bmcsettings.yaml
@@ -10,4 +10,4 @@ spec:
   settingsFlow:
     - name: bmc-setting
       priority: 1
-      settings: (from_items([[($values.bmcSettingKey), ($values.bmcSettingValue)]]))
+      settings: (from_items([[($values."08-bmcsettings".key), ($values."08-bmcsettings".value)]]))