diff --git a/docs/modules/hbase/examples/getting_started/hdfs.yaml b/docs/modules/hbase/examples/getting_started/hdfs.yaml
index d862f872..feb4abf9 100644
--- a/docs/modules/hbase/examples/getting_started/hdfs.yaml
+++ b/docs/modules/hbase/examples/getting_started/hdfs.yaml
@@ -7,8 +7,9 @@ spec:
   image:
     productVersion: 3.3.4
     stackableVersion: 0.2.0
-  zookeeperConfigMapName: simple-znode
-  dfsReplication: 3
+  clusterConfig:
+    dfsReplication: 1
+    zookeeperConfigMapName: simple-znode
   nameNodes:
     roleGroups:
       default:
diff --git a/tests/templates/kuttl/logging/03-install-hdfs.yaml.j2 b/tests/templates/kuttl/logging/03-install-hdfs.yaml.j2
index 75c8e268..8b059ed6 100644
--- a/tests/templates/kuttl/logging/03-install-hdfs.yaml.j2
+++ b/tests/templates/kuttl/logging/03-install-hdfs.yaml.j2
@@ -7,9 +7,10 @@ spec:
   image:
     productVersion: "{{ test_scenario['values']['hdfs-latest'].split('-stackable')[0] }}"
     stackableVersion: "{{ test_scenario['values']['hdfs-latest'].split('-stackable')[1] }}"
-  zookeeperConfigMapName: test-znode
+  clusterConfig:
+    zookeeperConfigMapName: test-znode
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
-  vectorAggregatorConfigMapName: vector-aggregator-discovery
+    vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
   nameNodes:
     config:
diff --git a/tests/templates/kuttl/orphaned_resources/02-install-hdfs.yaml.j2 b/tests/templates/kuttl/orphaned_resources/02-install-hdfs.yaml.j2
index 75c8e268..8b059ed6 100644
--- a/tests/templates/kuttl/orphaned_resources/02-install-hdfs.yaml.j2
+++ b/tests/templates/kuttl/orphaned_resources/02-install-hdfs.yaml.j2
@@ -7,9 +7,10 @@ spec:
   image:
     productVersion: "{{ test_scenario['values']['hdfs-latest'].split('-stackable')[0] }}"
     stackableVersion: "{{ test_scenario['values']['hdfs-latest'].split('-stackable')[1] }}"
-  zookeeperConfigMapName: test-znode
+  clusterConfig:
+    zookeeperConfigMapName: test-znode
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
-  vectorAggregatorConfigMapName: vector-aggregator-discovery
+    vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
   nameNodes:
     config:
diff --git a/tests/templates/kuttl/resources/02-install-hdfs.yaml.j2 b/tests/templates/kuttl/resources/02-install-hdfs.yaml.j2
index 75c8e268..8b059ed6 100644
--- a/tests/templates/kuttl/resources/02-install-hdfs.yaml.j2
+++ b/tests/templates/kuttl/resources/02-install-hdfs.yaml.j2
@@ -7,9 +7,10 @@ spec:
   image:
     productVersion: "{{ test_scenario['values']['hdfs-latest'].split('-stackable')[0] }}"
     stackableVersion: "{{ test_scenario['values']['hdfs-latest'].split('-stackable')[1] }}"
-  zookeeperConfigMapName: test-znode
+  clusterConfig:
+    zookeeperConfigMapName: test-znode
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
-  vectorAggregatorConfigMapName: vector-aggregator-discovery
+    vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
   nameNodes:
     config:
diff --git a/tests/templates/kuttl/smoke/02-install-hdfs.yaml.j2 b/tests/templates/kuttl/smoke/02-install-hdfs.yaml.j2
index 18c53703..c634cc7b 100644
--- a/tests/templates/kuttl/smoke/02-install-hdfs.yaml.j2
+++ b/tests/templates/kuttl/smoke/02-install-hdfs.yaml.j2
@@ -7,9 +7,10 @@ spec:
   image:
     productVersion: "{{ test_scenario['values']['hdfs'].split('-stackable')[0] }}"
     stackableVersion: "{{ test_scenario['values']['hdfs'].split('-stackable')[1] }}"
-  zookeeperConfigMapName: test-znode
+  clusterConfig:
+    zookeeperConfigMapName: test-znode
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
-  vectorAggregatorConfigMapName: vector-aggregator-discovery
+    vectorAggregatorConfigMapName: vector-aggregator-discovery
 {% endif %}
   nameNodes:
     config: