diff --git a/templates/testsuite-pod.yaml b/templates/testsuite-pod.yaml
index b0fa8f1..6379b6a 100644
--- a/templates/testsuite-pod.yaml
+++ b/templates/testsuite-pod.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.global.testsuite_ui.enabled }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -176,4 +177,4 @@ spec:
           secret:
             defaultMode: 0400
             secretName: ssh-keys-dvc
-      {{- end }}
+      {{- end }}
\ No newline at end of file
diff --git a/templates/testsuite-ui-pod.yaml b/templates/testsuite-ui-pod.yaml
new file mode 100644
index 0000000..264cf24
--- /dev/null
+++ b/templates/testsuite-ui-pod.yaml
@@ -0,0 +1,45 @@
+{{- if .Values.global.testsuite_ui.enabled }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: testsuite-ui
+spec:
+  backoffLimit: 0
+  completions: 1
+  parallelism: 1
+  template:
+    metadata:
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "8080"
+        prometheus.io/path: "/metrics"
+    spec:
+      {{- if .Values.global.imagePullSecrets }}
+      imagePullSecrets:
+      {{- range .Values.global.imagePullSecrets }}
+      - name: {{ . }}
+      {{- end }}
+      {{- end }}
+      restartPolicy: Never
+      containers:
+      - name: testsuite
+        image: "{{ .Values.global.imageRegistry }}/red/testsuite-ui:{{  .Values.global.testsuite_ui.version }}"
+        imagePullPolicy: {{ .Values.global.imagePullPolicy }}
+        resources:
+          limits:
+            cpu: "2000m"
+            memory: "8192Mi"
+          requests:
+            cpu: "500m"
+            memory: "4096Mi"
+        volumeMounts:
+          - mountPath: /keys
+            name: ssh-keys-dvc
+            readOnly: true
+      volumes:
+        # ToDo add known_hosts
+        - name: ssh-keys-dvc
+          secret:
+            defaultMode: 0400
+            secretName: ssh-keys-dvc
+{{- end }}
diff --git a/values.yaml b/values.yaml
index a2e551b..3fdbc09 100644
--- a/values.yaml
+++ b/values.yaml
@@ -4,6 +4,9 @@
     imagePullSecrets:
       - knecon
     imagePullPolicy: Always
+    testsuite_ui:
+      enabled: false
+      version: 0.1.0-1
 
   basic:
     realms: