diff --git a/src/helm/azure-pipelines-agent/templates/statefulset.yaml b/src/helm/azure-pipelines-agent/templates/statefulset.yaml
index 0657d2c9..8da529a6 100644
--- a/src/helm/azure-pipelines-agent/templates/statefulset.yaml
+++ b/src/helm/azure-pipelines-agent/templates/statefulset.yaml
@@ -47,7 +47,7 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
             {{- end }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.repository }}-{{ .Values.image.tagSuffix | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: AZP_AGENT_NAME
diff --git a/src/helm/azure-pipelines-agent/values.yaml b/src/helm/azure-pipelines-agent/values.yaml
index 75f5d633..c6bdddc7 100644
--- a/src/helm/azure-pipelines-agent/values.yaml
+++ b/src/helm/azure-pipelines-agent/values.yaml
@@ -5,10 +5,10 @@
 replicaCount: 1
 
 image:
-  repository: ghcr.io/clemlesne/azure-pipelines-agent:bullseye-main
+  repository: ghcr.io/clemlesne/azure-pipelines-agent:bullseye
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
+  tagSuffix: ""
 
 imagePullSecrets: []
 nameOverride: ""