diff --git a/CHANGELOG.md b/CHANGELOG.md
index 002dbaa..aac9ea5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# 1.9.0
+:new: What's new:
+- Decouple lakeFS image tag from `Chart.AppVersion`: select community or enterprise tag via `image.community.tag` / `image.enterprise.tag` based on the `enterprise.enabled` flag
+
 # 1.8.1
 :new: What's new:
 - Update lakeFS version to [1.80.0](https://github.com/treeverse/lakeFS/releases/tag/v1.80.0)
diff --git a/charts/lakefs/Chart.yaml b/charts/lakefs/Chart.yaml
index a042ff4..80cab02 100644
--- a/charts/lakefs/Chart.yaml
+++ b/charts/lakefs/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: lakefs
 description: A Helm chart for running LakeFS on Kubernetes
 type: application
-version: 1.8.1
+version: 1.9.0
 appVersion: 1.80.0
 
 home: https://lakefs.io
diff --git a/charts/lakefs/templates/_helpers.tpl b/charts/lakefs/templates/_helpers.tpl
index d3bfc1a..eb70e07 100644
--- a/charts/lakefs/templates/_helpers.tpl
+++ b/charts/lakefs/templates/_helpers.tpl
@@ -81,6 +81,21 @@ Define which repository to use according to the following:
 {{- end }}
 {{- end }}
 
+{{/*
+Select the image tag. An explicit .Values.image.tag wins (back-compat override).
+Otherwise pick community or enterprise tag based on the enterprise flag so each
+variant can release on its own cadence.
+*/}}
+{{- define "lakefs.tag" -}}
+{{- if .Values.image.tag }}
+{{- .Values.image.tag }}
+{{- else if (.Values.enterprise).enabled }}
+{{- required "image.enterprise.tag is required when enterprise.enabled is true" (((.Values.image).enterprise).tag) }}
+{{- else }}
+{{- required "image.community.tag is required" (((.Values.image).community).tag) }}
+{{- end }}
+{{- end }}
+
 {{- define "lakefs.checkDeprecated" -}}
 {{- if .Values.fluffy -}}
 {{- fail "Fluffy configuration detected. Please migrate to lakeFS Enterprise auth configuration and use treeverse/lakefs-enterprise docker image. See migration guide: https://docs.lakefs.io/latest/enterprise/upgrade/#kubernetes-migrating-with-helm-from-fluffy-to-new-lakefs-enterprise." -}}
diff --git a/charts/lakefs/templates/deployment.yaml b/charts/lakefs/templates/deployment.yaml
index aee320c..7930843 100644
--- a/charts/lakefs/templates/deployment.yaml
+++ b/charts/lakefs/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
           {{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ include "lakefs.repository" . }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ include "lakefs.repository" . }}:{{ include "lakefs.tag" . }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
diff --git a/charts/lakefs/values.yaml b/charts/lakefs/values.yaml
index 358d018..f7b6085 100644
--- a/charts/lakefs/values.yaml
+++ b/charts/lakefs/values.yaml
@@ -6,6 +6,10 @@ replicaCount: 1
 
 image:
   pullPolicy: IfNotPresent
+  community:
+    tag: "1.80.0"
+  enterprise:
+    tag: "1.80.0"
   privateRegistry:
     enabled: false
     secretToken: null