diff --git a/tests/templates/kuttl/cluster-operation/10-install-zookeeper.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-install-zookeeper.yaml.j2
index 6323df17..770634b6 100644
--- a/tests/templates/kuttl/cluster-operation/10-install-zookeeper.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/10-install-zookeeper.yaml.j2
@@ -14,7 +14,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:
diff --git a/tests/templates/kuttl/cluster-operation/20-stop-zookeeper.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-stop-zookeeper.yaml.j2
index f1117b85..064492d7 100644
--- a/tests/templates/kuttl/cluster-operation/20-stop-zookeeper.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/20-stop-zookeeper.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:
diff --git a/tests/templates/kuttl/cluster-operation/30-pause-zookeeper.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-pause-zookeeper.yaml.j2
index 8ead92dc..4ce36e5f 100644
--- a/tests/templates/kuttl/cluster-operation/30-pause-zookeeper.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/30-pause-zookeeper.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:
diff --git a/tests/templates/kuttl/cluster-operation/40-restart-zookeeper.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-restart-zookeeper.yaml.j2
index 2fe48019..06e7c1ca 100644
--- a/tests/templates/kuttl/cluster-operation/40-restart-zookeeper.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/40-restart-zookeeper.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:
diff --git a/tests/templates/kuttl/delete-rolegroup/05-install-zookeeper.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/05-install-zookeeper.yaml.j2
index 0a956011..70b9c1f5 100644
--- a/tests/templates/kuttl/delete-rolegroup/05-install-zookeeper.yaml.j2
+++ b/tests/templates/kuttl/delete-rolegroup/05-install-zookeeper.yaml.j2
@@ -14,7 +14,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     tls:
diff --git a/tests/templates/kuttl/delete-rolegroup/10-remove-secondary.yaml.j2 b/tests/templates/kuttl/delete-rolegroup/10-remove-secondary.yaml.j2
index c6c691c5..5c290acc 100644
--- a/tests/templates/kuttl/delete-rolegroup/10-remove-secondary.yaml.j2
+++ b/tests/templates/kuttl/delete-rolegroup/10-remove-secondary.yaml.j2
@@ -5,7 +5,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     tls:
diff --git a/tests/templates/kuttl/logging/11-install-zookeeper.yaml.j2 b/tests/templates/kuttl/logging/11-install-zookeeper.yaml.j2
index 6e45ec52..f6e773dd 100644
--- a/tests/templates/kuttl/logging/11-install-zookeeper.yaml.j2
+++ b/tests/templates/kuttl/logging/11-install-zookeeper.yaml.j2
@@ -28,7 +28,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     vectorAggregatorConfigMapName: zookeeper-vector-aggregator-discovery
diff --git a/tests/templates/kuttl/smoke/10-install-zookeeper.yaml.j2 b/tests/templates/kuttl/smoke/10-install-zookeeper.yaml.j2
index 871ca777..8244aa7a 100644
--- a/tests/templates/kuttl/smoke/10-install-zookeeper.yaml.j2
+++ b/tests/templates/kuttl/smoke/10-install-zookeeper.yaml.j2
@@ -14,7 +14,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
 {% if test_scenario['values']['use-server-tls'] == 'true' %}
diff --git a/tests/templates/kuttl/znode/10-install-zookeeper.yaml.j2 b/tests/templates/kuttl/znode/10-install-zookeeper.yaml.j2
index 7bab17a4..65949200 100644
--- a/tests/templates/kuttl/znode/10-install-zookeeper.yaml.j2
+++ b/tests/templates/kuttl/znode/10-install-zookeeper.yaml.j2
@@ -14,7 +14,12 @@ metadata:
   name: test-zk
 spec:
   image:
+{% if test_scenario['values']['zookeeper-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['zookeeper-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['zookeeper-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['zookeeper-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
   clusterConfig:
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index b42371b7..2170418b 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -3,9 +3,13 @@ dimensions:
   - name: zookeeper
     values:
       - 3.9.2
+      # To use a custom image, add a comma and the full name after the product version
+      # - 3.9.2,docker.stackable.tech/stackable/zookeeper:3.9.2-stackable0.0.0-dev
   - name: zookeeper-latest
     values:
       - 3.9.2
+      # To use a custom image, add a comma and the full name after the product version
+      # - 3.9.2,docker.stackable.tech/stackable/zookeeper:3.9.2-stackable0.0.0-dev
   - name: use-server-tls
     values:
       - "true"