diff --git a/tests/templates/kuttl/cluster-operation/20-install-superset.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-install-superset.yaml.j2
index d7254cac..e303157d 100644
--- a/tests/templates/kuttl/cluster-operation/20-install-superset.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/20-install-superset.yaml.j2
@@ -25,7 +25,12 @@ metadata:
   name: superset
 spec:
   image:
+{% if test_scenario['values']['superset-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['superset-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['superset-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['superset-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     credentialsSecret: superset-credentials
diff --git a/tests/templates/kuttl/cluster-operation/30-install-superset-pause.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-install-superset-pause.yaml.j2
index 79639521..21d71995 100644
--- a/tests/templates/kuttl/cluster-operation/30-install-superset-pause.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/30-install-superset-pause.yaml.j2
@@ -25,7 +25,12 @@ metadata:
   name: superset
 spec:
   image:
+{% if test_scenario['values']['superset-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['superset-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['superset-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['superset-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     clusterOperation:
diff --git a/tests/templates/kuttl/cluster-operation/40-install-superset-stop.yaml.j2 b/tests/templates/kuttl/cluster-operation/40-install-superset-stop.yaml.j2
index 8cfc3b9f..64e7dd92 100644
--- a/tests/templates/kuttl/cluster-operation/40-install-superset-stop.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/40-install-superset-stop.yaml.j2
@@ -25,7 +25,12 @@ metadata:
   name: superset
 spec:
   image:
+{% if test_scenario['values']['superset-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['superset-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['superset-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['superset-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     clusterOperation:
diff --git a/tests/templates/kuttl/cluster-operation/50-install-superset-restart.yaml.j2 b/tests/templates/kuttl/cluster-operation/50-install-superset-restart.yaml.j2
index a6009d8d..43f8c936 100644
--- a/tests/templates/kuttl/cluster-operation/50-install-superset-restart.yaml.j2
+++ b/tests/templates/kuttl/cluster-operation/50-install-superset-restart.yaml.j2
@@ -25,7 +25,12 @@ metadata:
   name: superset
 spec:
   image:
+{% if test_scenario['values']['superset-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['superset-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['superset-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['superset-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     clusterOperation:
diff --git a/tests/templates/kuttl/druid-connection/20-install-superset.yaml.j2 b/tests/templates/kuttl/druid-connection/20-install-superset.yaml.j2
index 925dcdbd..30255a0a 100644
--- a/tests/templates/kuttl/druid-connection/20-install-superset.yaml.j2
+++ b/tests/templates/kuttl/druid-connection/20-install-superset.yaml.j2
@@ -25,7 +25,12 @@ metadata:
   name: test-superset
 spec:
   image:
+{% if test_scenario['values']['superset'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['superset'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['superset'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['superset'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     credentialsSecret: superset-credentials
diff --git a/tests/templates/kuttl/ldap/50-install-superset.yaml.j2 b/tests/templates/kuttl/ldap/50-install-superset.yaml.j2
index a0fcc35c..5835a528 100644
--- a/tests/templates/kuttl/ldap/50-install-superset.yaml.j2
+++ b/tests/templates/kuttl/ldap/50-install-superset.yaml.j2
@@ -29,7 +29,12 @@ metadata:
   name: superset-with-ldap
 spec:
   image:
+{% if test_scenario['values']['superset'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['superset'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['superset'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['superset'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     authentication:
diff --git a/tests/templates/kuttl/logging/21-install-superset.yaml.j2 b/tests/templates/kuttl/logging/21-install-superset.yaml.j2
index e0d4f558..029cd73d 100644
--- a/tests/templates/kuttl/logging/21-install-superset.yaml.j2
+++ b/tests/templates/kuttl/logging/21-install-superset.yaml.j2
@@ -53,7 +53,12 @@ metadata:
   name: superset
 spec:
   image:
+{% if test_scenario['values']['superset'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['superset'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['superset'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['superset'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     credentialsSecret: superset-credentials
diff --git a/tests/templates/kuttl/oidc/install-superset.yaml.j2 b/tests/templates/kuttl/oidc/install-superset.yaml.j2
index 23e10379..b2c5e3e3 100644
--- a/tests/templates/kuttl/oidc/install-superset.yaml.j2
+++ b/tests/templates/kuttl/oidc/install-superset.yaml.j2
@@ -36,7 +36,12 @@ metadata:
   name: superset
 spec:
   image:
+{% if test_scenario['values']['superset'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['superset'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['superset'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['superset'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     authentication:
diff --git a/tests/templates/kuttl/resources/20-install-superset.yaml.j2 b/tests/templates/kuttl/resources/20-install-superset.yaml.j2
index 1093be7d..5196e307 100644
--- a/tests/templates/kuttl/resources/20-install-superset.yaml.j2
+++ b/tests/templates/kuttl/resources/20-install-superset.yaml.j2
@@ -23,7 +23,12 @@ metadata:
   name: superset
 spec:
   image:
+{% if test_scenario['values']['superset-latest'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['superset-latest'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['superset-latest'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['superset-latest'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     credentialsSecret: superset-credentials
diff --git a/tests/templates/kuttl/smoke/30-install-superset.yaml.j2 b/tests/templates/kuttl/smoke/30-install-superset.yaml.j2
index 1de4b50c..872202e5 100644
--- a/tests/templates/kuttl/smoke/30-install-superset.yaml.j2
+++ b/tests/templates/kuttl/smoke/30-install-superset.yaml.j2
@@ -25,7 +25,12 @@ metadata:
   name: superset
 spec:
   image:
+{% if test_scenario['values']['superset'].find(",") > 0 %}
+    custom: "{{ test_scenario['values']['superset'].split(',')[1] }}"
+    productVersion: "{{ test_scenario['values']['superset'].split(',')[0] }}"
+{% else %}
     productVersion: "{{ test_scenario['values']['superset'] }}"
+{% endif %}
     pullPolicy: IfNotPresent
   clusterConfig:
     credentialsSecret: superset-credentials
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
index 6fc557f3..c9bd027f 100644
--- a/tests/test-definition.yaml
+++ b/tests/test-definition.yaml
@@ -8,6 +8,8 @@ dimensions:
     values:
       - 4.0.2
       - 4.1.1
+      # Or use a custom image:
+      # - 4.1.1,oci.stackable.tech/razvan/superset:4.1.1-stackable0.0.0-dev
   - name: superset-latest
     values:
       - 4.1.1