diff --git a/tests/templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2
index 0a05e2ff..34297d70 100644
--- a/tests/templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/20-install-hdfs.yaml.j2
@@ -9,7 +9,12 @@ metadata:
   name: hdfs
 spec:
   image:
+{% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hadoop-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hadoop-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     dfsReplication: 1
diff --git a/tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2
index 67b97daf..d4cd72c8 100644
--- a/tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/30-stop-hdfs.yaml.j2
@@ -9,7 +9,12 @@ metadata:
   name: hdfs
 spec:
   image:
+{% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hadoop-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hadoop-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     dfsReplication: 1
diff --git a/tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2
index 0f3ee571..19f41a53 100644
--- a/tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/40-pause-hdfs.yaml.j2
@@ -9,7 +9,12 @@ metadata:
   name: hdfs
 spec:
   image:
+{% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hadoop-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hadoop-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     dfsReplication: 1
diff --git a/tests/templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2 b/tests/templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2
index 0a05e2ff..34297d70 100644
--- a/tests/templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/50-restart-hdfs.yaml.j2
@@ -9,7 +9,12 @@ metadata:
   name: hdfs
 spec:
   image:
+{% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hadoop-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hadoop-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     dfsReplication: 1
diff --git a/tests/templates/kuttl/external-access/30-install-hdfs.yaml.j2 b/tests/templates/kuttl/external-access/30-install-hdfs.yaml.j2
index c1af5f95..5dfe1376 100644
--- a/tests/templates/kuttl/external-access/30-install-hdfs.yaml.j2
+++ b/tests/templates/kuttl/external-access/30-install-hdfs.yaml.j2
@@ -11,7 +11,12 @@ metadata:
   name: hdfs
 spec:
   image:
+{% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hadoop-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hadoop-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     zookeeperConfigMapName: hdfs-zk
diff --git a/tests/templates/kuttl/kerberos/20-install-hdfs.txt.j2 b/tests/templates/kuttl/kerberos/20-install-hdfs.txt.j2
index 2b657881..7fd711b4 100644
--- a/tests/templates/kuttl/kerberos/20-install-hdfs.txt.j2
+++ b/tests/templates/kuttl/kerberos/20-install-hdfs.txt.j2
@@ -5,7 +5,12 @@ metadata:
   name: hdfs
 spec:
   image:
+{% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hadoop-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hadoop-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     zookeeperConfigMapName: hdfs-zk
diff --git a/tests/templates/kuttl/kerberos/30-access-hdfs.txt.j2 b/tests/templates/kuttl/kerberos/30-access-hdfs.txt.j2
index 46434cce..5dda7a9d 100644
--- a/tests/templates/kuttl/kerberos/30-access-hdfs.txt.j2
+++ b/tests/templates/kuttl/kerberos/30-access-hdfs.txt.j2
@@ -9,7 +9,11 @@ spec:
       serviceAccountName: test-sa
       containers:
         - name: access-hdfs
+{% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
+          image: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
+{% else %}
           image: docker.stackable.tech/stackable/hadoop:{{ test_scenario['values']['hadoop-latest'] }}-stackable0.0.0-dev
+{% endif %}
           env:
             - name: HADOOP_CONF_DIR
               value: /stackable/conf/hdfs
diff --git a/tests/templates/kuttl/kerberos/32-check-file.txt.j2 b/tests/templates/kuttl/kerberos/32-check-file.txt.j2
index 274e7c00..947ddf35 100644
--- a/tests/templates/kuttl/kerberos/32-check-file.txt.j2
+++ b/tests/templates/kuttl/kerberos/32-check-file.txt.j2
@@ -9,7 +9,11 @@ spec:
       serviceAccountName: test-sa
       containers:
         - name: check-hdfs
+{% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
+          image: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
+{% else %}
           image: docker.stackable.tech/stackable/hadoop:{{ test_scenario['values']['hadoop-latest'] }}-stackable0.0.0-dev
+{% endif %}
           env:
             - name: HADOOP_CONF_DIR
               value: /stackable/conf/hdfs
diff --git a/tests/templates/kuttl/logging/04-install-hdfs-automatic-log.yaml.j2 b/tests/templates/kuttl/logging/04-install-hdfs-automatic-log.yaml.j2
index 7a0f920e..d9ba1139 100644
--- a/tests/templates/kuttl/logging/04-install-hdfs-automatic-log.yaml.j2
+++ b/tests/templates/kuttl/logging/04-install-hdfs-automatic-log.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-hdfs-automatic-log
 spec:
   image:
+{% if test_scenario['values']['hadoop'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hadoop'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hadoop'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hadoop'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     vectorAggregatorConfigMapName: hdfs-vector-aggregator-discovery
diff --git a/tests/templates/kuttl/logging/05-install-hdfs-custom-log.yaml.j2 b/tests/templates/kuttl/logging/05-install-hdfs-custom-log.yaml.j2
index 2b77692e..973e5890 100644
--- a/tests/templates/kuttl/logging/05-install-hdfs-custom-log.yaml.j2
+++ b/tests/templates/kuttl/logging/05-install-hdfs-custom-log.yaml.j2
@@ -62,7 +62,12 @@ metadata:
   name: test-hdfs-custom-log
 spec:
   image:
+{% if test_scenario['values']['hadoop'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hadoop'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hadoop'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hadoop'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     vectorAggregatorConfigMapName: hdfs-vector-aggregator-discovery
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 d5a411c4..a362f908 100644
--- a/tests/templates/kuttl/orphaned-resources/02-install-hdfs.yaml.j2
+++ b/tests/templates/kuttl/orphaned-resources/02-install-hdfs.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-hdfs
 spec:
   image:
+{% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hadoop-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hadoop-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     dfsReplication: 1
diff --git a/tests/templates/kuttl/orphaned-resources/03-remove-datanode.yaml.j2 b/tests/templates/kuttl/orphaned-resources/03-remove-datanode.yaml.j2
index 994bc944..ee8134af 100644
--- a/tests/templates/kuttl/orphaned-resources/03-remove-datanode.yaml.j2
+++ b/tests/templates/kuttl/orphaned-resources/03-remove-datanode.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-hdfs
 spec:
   image:
+{% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hadoop-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hadoop-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     dfsReplication: 1
diff --git a/tests/templates/kuttl/orphaned-resources/04-change-datanode-rolegroup.yaml.j2 b/tests/templates/kuttl/orphaned-resources/04-change-datanode-rolegroup.yaml.j2
index 6bcb9195..bd1de80e 100644
--- a/tests/templates/kuttl/orphaned-resources/04-change-datanode-rolegroup.yaml.j2
+++ b/tests/templates/kuttl/orphaned-resources/04-change-datanode-rolegroup.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-hdfs
 spec:
   image:
+{% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hadoop-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hadoop-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   dataNodes:
     config:
diff --git a/tests/templates/kuttl/profiling/03-install-hdfs.yaml.j2 b/tests/templates/kuttl/profiling/03-install-hdfs.yaml.j2
index c266897c..e34e4ab8 100644
--- a/tests/templates/kuttl/profiling/03-install-hdfs.yaml.j2
+++ b/tests/templates/kuttl/profiling/03-install-hdfs.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-hdfs
 spec:
   image:
+{% if test_scenario['values']['hadoop'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hadoop'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hadoop'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hadoop'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     dfsReplication: 1
diff --git a/tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2 b/tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2
index 2cdbc57f..ab0fdc0c 100644
--- a/tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2
+++ b/tests/templates/kuttl/smoke/30-install-hdfs.yaml.j2
@@ -11,7 +11,12 @@ metadata:
   name: hdfs
 spec:
   image:
+{% if test_scenario['values']['hadoop'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hadoop'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hadoop'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hadoop'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     zookeeperConfigMapName: hdfs-zk
diff --git a/tests/templates/kuttl/topology-provider/11-install-hdfs.yaml.j2 b/tests/templates/kuttl/topology-provider/11-install-hdfs.yaml.j2
index 81fb1445..ffa78237 100644
--- a/tests/templates/kuttl/topology-provider/11-install-hdfs.yaml.j2
+++ b/tests/templates/kuttl/topology-provider/11-install-hdfs.yaml.j2
@@ -11,7 +11,12 @@ commands:
         name: hdfs
       spec:
         image:
+{% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
+          custom: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
+          productVersion: "{{ test_scenario['values']['hadoop-latest'].split(',')[0] }}"
+{% else %}
           productVersion: "{{ test_scenario['values']['hadoop-latest'] }}"
+{% endif %}
           pullPolicy: IfNotPresent
         clusterConfig:
           zookeeperConfigMapName: hdfs-zk
diff --git a/tests/templates/kuttl/topology-provider/20-access-hdfs.yaml.j2 b/tests/templates/kuttl/topology-provider/20-access-hdfs.yaml.j2
index f84d44b2..160985ca 100644
--- a/tests/templates/kuttl/topology-provider/20-access-hdfs.yaml.j2
+++ b/tests/templates/kuttl/topology-provider/20-access-hdfs.yaml.j2
@@ -15,7 +15,11 @@ commands:
             serviceAccountName: test-sa
             containers:
               - name: access-hdfs
+{% if test_scenario['values']['hadoop-latest'].find(",") > 0 %}
+                image: "{{ test_scenario['values']['hadoop-latest'].split(',')[1] }}"
+{% else %}
                 image: docker.stackable.tech/stackable/hadoop:{{ test_scenario['values']['hadoop-latest'] }}-stackable0.0.0-dev
+{% endif %}
                 env:
                   - name: HADOOP_CONF_DIR
                     value: /stackable/conf/hdfs
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 0c00e725..17db8ee5 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -5,9 +5,13 @@ dimensions:
       - 3.3.4
       - 3.3.6
       - 3.4.0
+      # To use a custom image, add a comma and the full name after the product version
+      # - 3.4.0,docker.stackable.tech/sandbox/hadoop:3.4.0-stackable0.0.0-dev
   - name: hadoop-latest
     values:
-      - 3.3.6
+      - 3.4.0
+      # To use a custom image, add a comma and the full name after the product version
+      # - 3.4.0,docker.stackable.tech/sandbox/hadoop:3.4.0-stackable0.0.0-dev
   - name: hadoop-external-client-docker-image
     values:
       - 3.3.6