diff --git a/tests/templates/kuttl/cluster-operation/20-install-kafka.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-install-kafka.yaml.j2
index 463c0c6a..6d391b65 100644
--- a/tests/templates/kuttl/cluster-operation/20-install-kafka.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/20-install-kafka.yaml.j2
@@ -9,7 +9,12 @@ metadata:
   name: test-kafka
 spec:
   image:
+{% if test_scenario['values']['kafka-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['kafka-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['kafka-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
diff --git a/tests/templates/kuttl/cluster-operation/30-stop-kafka.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-stop-kafka.yaml.j2
index cc5d0ae1..08f1661a 100644
--- a/tests/templates/kuttl/cluster-operation/30-stop-kafka.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/30-stop-kafka.yaml.j2
@@ -9,7 +9,12 @@ metadata:
   name: test-kafka
 spec:
   image:
+{% if test_scenario['values']['kafka-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['kafka-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['kafka-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
diff --git a/tests/templates/kuttl/cluster-operation/40-pause-kafka.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-pause-kafka.yaml.j2
index 21b16c60..c961ca4d 100644
--- a/tests/templates/kuttl/cluster-operation/40-pause-kafka.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/40-pause-kafka.yaml.j2
@@ -9,7 +9,12 @@ metadata:
   name: test-kafka
 spec:
   image:
+{% if test_scenario['values']['kafka-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['kafka-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['kafka-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
diff --git a/tests/templates/kuttl/cluster-operation/50-restart-kafka.yaml.j2 b/tests/templates/kuttl/cluster-operation/50-restart-kafka.yaml.j2
index ba24228a..81d43637 100644
--- a/tests/templates/kuttl/cluster-operation/50-restart-kafka.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/50-restart-kafka.yaml.j2
@@ -9,7 +9,12 @@ metadata:
   name: test-kafka
 spec:
   image:
+{% if test_scenario['values']['kafka-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['kafka-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['kafka-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
+{% endif %}
   clusterConfig:
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
diff --git a/tests/templates/kuttl/configuration/20-install-kafka.yaml.j2 b/tests/templates/kuttl/configuration/20-install-kafka.yaml.j2
index ca380510..eefa7550 100644
--- a/tests/templates/kuttl/configuration/20-install-kafka.yaml.j2
+++ b/tests/templates/kuttl/configuration/20-install-kafka.yaml.j2
@@ -9,7 +9,12 @@ metadata:
   name: test-kafka
 spec:
   image:
+{% if test_scenario['values']['kafka-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['kafka-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['kafka-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['kafka-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
diff --git a/tests/templates/kuttl/delete-rolegroup/02-install-kafka.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/02-install-kafka.yaml.j2
index 6b25a73a..be8651b3 100644
--- a/tests/templates/kuttl/delete-rolegroup/02-install-kafka.yaml.j2
+++ b/tests/templates/kuttl/delete-rolegroup/02-install-kafka.yaml.j2
@@ -9,7 +9,12 @@ metadata:
   name: test-kafka
 spec:
   image:
+{% if test_scenario['values']['kafka'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['kafka'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['kafka'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['kafka'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
diff --git a/tests/templates/kuttl/delete-rolegroup/03-delete-secondary.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/03-delete-secondary.yaml.j2
index 5a904a3f..3c7824a8 100644
--- a/tests/templates/kuttl/delete-rolegroup/03-delete-secondary.yaml.j2
+++ b/tests/templates/kuttl/delete-rolegroup/03-delete-secondary.yaml.j2
@@ -9,7 +9,12 @@ metadata:
   name: test-kafka
 spec:
   image:
+{% if test_scenario['values']['kafka'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['kafka'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['kafka'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['kafka'] }}"
+{% endif %}
   clusterConfig:
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
diff --git a/tests/templates/kuttl/logging/04-install-kafka.yaml.j2 b/tests/templates/kuttl/logging/04-install-kafka.yaml.j2
index 1f638ddd..e83fc50b 100644
--- a/tests/templates/kuttl/logging/04-install-kafka.yaml.j2
+++ b/tests/templates/kuttl/logging/04-install-kafka.yaml.j2
@@ -25,7 +25,12 @@ metadata:
   name: test-kafka
 spec:
   image:
+{% if test_scenario['values']['kafka'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['kafka'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['kafka'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['kafka'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     tls:
diff --git a/tests/templates/kuttl/smoke/30-install-kafka.yaml.j2 b/tests/templates/kuttl/smoke/30-install-kafka.yaml.j2
index 9754bbe7..baa74d42 100644
--- a/tests/templates/kuttl/smoke/30-install-kafka.yaml.j2
+++ b/tests/templates/kuttl/smoke/30-install-kafka.yaml.j2
@@ -9,7 +9,12 @@ metadata:
   name: test-kafka
 spec:
   image:
+{% if test_scenario['values']['kafka'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['kafka'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['kafka'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['kafka'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     tls:
diff --git a/tests/templates/kuttl/tls/20-install-kafka.yaml.j2 b/tests/templates/kuttl/tls/20-install-kafka.yaml.j2
index 76883a71..54a7a49d 100644
--- a/tests/templates/kuttl/tls/20-install-kafka.yaml.j2
+++ b/tests/templates/kuttl/tls/20-install-kafka.yaml.j2
@@ -37,7 +37,12 @@ metadata:
   name: test-kafka
 spec:
   image:
+{% if test_scenario['values']['kafka'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['kafka'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['kafka'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['kafka'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
 {% if test_scenario['values']['use-client-auth-tls'] == 'true' %}
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 4e995678..6486e1a3 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -8,9 +8,15 @@ dimensions:
     values:
       - 3.7.1
       - 3.8.0
+      # Alternatively, if you want to use a custom image, append a comma and the full image name to the product version
+      # as in the example below.
+      # - 3.8.0,docker.stackable.tech/stackable/kafka:3.8.0-stackable0.0.0-dev
   - name: kafka-latest
     values:
       - 3.7.1 # Using LTS version here
+      # Alternatively, if you want to use a custom image, append a comma and the full image name to the product version
+      # as in the example below.
+      # - 3.7.1,docker.stackable.tech/stackable/kafka:3.7.1-stackable0.0.0-dev
   - name: zookeeper
     values:
       - 3.9.2