diff --git a/zammad/Chart.yaml b/zammad/Chart.yaml
index 81294727..fac42a96 100644
--- a/zammad/Chart.yaml
+++ b/zammad/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: zammad
-version: 0.1.2
+version: 0.1.3
 appVersion: 2.8.0
 description: Zammad is a web based open source helpdesk/customer support system with many features to manage customer communication via several channels like telephone, facebook, twitter, chat and e-mails.
 home: https://zammad.org
diff --git a/zammad/templates/statefulset.yaml b/zammad/templates/statefulset.yaml
index ca4b2323..c364820d 100644
--- a/zammad/templates/statefulset.yaml
+++ b/zammad/templates/statefulset.yaml
@@ -21,7 +21,7 @@ spec:
     spec:
       initContainers:
       - name: {{ .Chart.Name }}-init
-        image: {{ .Values.image.repository }}:zammad-{{ .Values.image.tag }}
+        image: {{ .Values.image.repository }}:{{if eq .Values.image.repository "zammad/zammad-docker-compose"}}zammad-{{ end }}{{ .Values.image.tag }}
         args: [ "zammad-init" ]
         env:
         {{- range $key, $value := .Values.env }}
@@ -34,7 +34,7 @@ spec:
            mountPath: /opt/zammad
       containers:
       - name: {{ .Chart.Name }}-nginx
-        image: {{ .Values.image.repository }}:zammad-{{ .Values.image.tag }}
+        image: {{ .Values.image.repository }}:{{if eq .Values.image.repository "zammad/zammad-docker-compose"}}zammad-{{ end }}{{ .Values.image.tag }}
         args: [ "zammad-nginx" ]
         env:
         {{- range $key, $value := .Values.env }}
@@ -65,7 +65,7 @@ spec:
         resources:
 {{ toYaml .Values.resources.nginx | indent 10 }}
       - name: {{ .Chart.Name }}-railsserver
-        image: {{ .Values.image.repository }}:zammad-{{ .Values.image.tag }}
+        image: {{ .Values.image.repository }}:{{if eq .Values.image.repository "zammad/zammad-docker-compose"}}zammad-{{ end }}{{ .Values.image.tag }}
         args: ["zammad-railsserver"]
         env:
         {{- range $key, $value := .Values.env }}
@@ -94,7 +94,7 @@ spec:
         resources:
 {{ toYaml .Values.resources.railsserver | indent 10 }}
       - name: {{ .Chart.Name }}-scheduler
-        image: {{ .Values.image.repository }}:zammad-{{ .Values.image.tag }}
+        image: {{ .Values.image.repository }}:{{if eq .Values.image.repository "zammad/zammad-docker-compose"}}zammad-{{ end }}{{ .Values.image.tag }}
         args: [ "zammad-scheduler" ]
         env:
         {{- range $key, $value := .Values.env }}
@@ -108,7 +108,7 @@ spec:
         resources:
 {{ toYaml .Values.resources.scheduler | indent 10 }}
       - name: {{ .Chart.Name }}-websocket
-        image: {{ .Values.image.repository }}:zammad-{{ .Values.image.tag }}
+        image: {{ .Values.image.repository }}:{{if eq .Values.image.repository "zammad/zammad-docker-compose"}}zammad-{{ end }}{{ .Values.image.tag }}
         args: [ "zammad-websocket" ]
         env:
         {{- range $key, $value := .Values.env }}
diff --git a/zammad/values.yaml b/zammad/values.yaml
index 546dcc97..2e089636 100644
--- a/zammad/values.yaml
+++ b/zammad/values.yaml
@@ -4,7 +4,7 @@ usePostgresql: true
 
 image:
   repository: zammad/zammad-docker-compose
-  tag: 2.8.0-35c3
+  tag: 2.8.0-21
   pullPolicy: IfNotPresent
 
 service: