diff --git a/tests/templates/kuttl/cluster-operation/03-install-hbase.yaml.j2 b/tests/templates/kuttl/cluster-operation/03-install-hbase.yaml.j2
index 002ff491..f68aee37 100644
--- a/tests/templates/kuttl/cluster-operation/03-install-hbase.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/03-install-hbase.yaml.j2
@@ -11,7 +11,12 @@ metadata:
   name: test-hbase
 spec:
   image:
+{% if test_scenario['values']['hbase-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hbase-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hbase-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hbase-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     hdfsConfigMapName: test-hdfs
diff --git a/tests/templates/kuttl/cluster-operation/10-pause-hbase.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-pause-hbase.yaml.j2
index 55d07082..b0862dae 100644
--- a/tests/templates/kuttl/cluster-operation/10-pause-hbase.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/10-pause-hbase.yaml.j2
@@ -11,7 +11,12 @@ metadata:
   name: test-hbase
 spec:
   image:
+{% if test_scenario['values']['hbase-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hbase-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hbase-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hbase-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     hdfsConfigMapName: test-hdfs
diff --git a/tests/templates/kuttl/cluster-operation/20-stop-hbase.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-stop-hbase.yaml.j2
index 5ce13daa..80acdb16 100644
--- a/tests/templates/kuttl/cluster-operation/20-stop-hbase.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/20-stop-hbase.yaml.j2
@@ -11,7 +11,12 @@ metadata:
   name: test-hbase
 spec:
   image:
+{% if test_scenario['values']['hbase-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hbase-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hbase-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hbase-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     hdfsConfigMapName: test-hdfs
diff --git a/tests/templates/kuttl/cluster-operation/30-restart-hbase.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-restart-hbase.yaml.j2
index ca5f40e6..c507e82e 100644
--- a/tests/templates/kuttl/cluster-operation/30-restart-hbase.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/30-restart-hbase.yaml.j2
@@ -11,7 +11,13 @@ metadata:
   name: test-hbase
 spec:
   image:
+{% if test_scenario['values']['hbase-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hbase-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hbase-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hbase-latest'] }}"
+{% endif %}
+    pullPolicy: IfNotPresent
   clusterConfig:
     hdfsConfigMapName: test-hdfs
     zookeeperConfigMapName: test-znode
diff --git a/tests/templates/kuttl/orphaned_resources/03-install-hbase.yaml.j2 b/tests/templates/kuttl/orphaned_resources/03-install-hbase.yaml.j2
index 81e22f84..08d33e65 100644
--- a/tests/templates/kuttl/orphaned_resources/03-install-hbase.yaml.j2
+++ b/tests/templates/kuttl/orphaned_resources/03-install-hbase.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-hbase
 spec:
   image:
+{% if test_scenario['values']['hbase-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hbase-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hbase-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hbase-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     hdfsConfigMapName: test-hdfs-namenode-default
diff --git a/tests/templates/kuttl/overrides/30-install-hbase.yaml.j2 b/tests/templates/kuttl/overrides/30-install-hbase.yaml.j2
index 34ad8d6f..61d99a2c 100644
--- a/tests/templates/kuttl/overrides/30-install-hbase.yaml.j2
+++ b/tests/templates/kuttl/overrides/30-install-hbase.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-hbase
 spec:
   image:
+{% if test_scenario['values']['hbase-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hbase-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hbase-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hbase-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     hdfsConfigMapName: test-hdfs-namenode-default
diff --git a/tests/templates/kuttl/resources/30-install-hbase.yaml.j2 b/tests/templates/kuttl/resources/30-install-hbase.yaml.j2
index abe97715..a4aecf82 100644
--- a/tests/templates/kuttl/resources/30-install-hbase.yaml.j2
+++ b/tests/templates/kuttl/resources/30-install-hbase.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-hbase
 spec:
   image:
+{% if test_scenario['values']['hbase-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['hbase-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['hbase-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['hbase-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     hdfsConfigMapName: test-hdfs-namenode-default