diff --git a/Chart.yaml b/Chart.yaml
index ec57cd9..dec49b4 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,3 +1,4 @@
 apiVersion: v1
 name: pgdog
 version: v0.28
+appVersion: "0.1.21"
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index 1d2af42..075a772 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -42,7 +42,7 @@ spec:
           {{- if .Values.image.name }}
           image: {{ .Values.image.name }}
           {{- else }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command: ["/usr/local/bin/pgdog"]
diff --git a/values.yaml b/values.yaml
index 9dc9e96..0e0dc97 100644
--- a/values.yaml
+++ b/values.yaml
@@ -24,8 +24,8 @@ podAnnotations: {}
 image:
   # repository is the Docker image repository
   repository: ghcr.io/pgdogdev/pgdog
-  # tag is the Docker image tag (defaults to "latest" if not specified)
-  tag: "latest"
+  # tag is the Docker image tag (defaults to Chart appVersion if not specified)
+  tag: ""
   # pullPolicy specifies when to use cached version of the image.
   pullPolicy: IfNotPresent
   # name is the full image name (DEPRECATED: use repository and tag)
@@ -164,7 +164,6 @@ service:
     # Valid values: "internet-facing" or "internal"
     scheme: "internal"
 
-
 # nodeSelector allows scheduling pods on nodes with specific labels
 nodeSelector: {}
 
@@ -375,7 +374,6 @@ queryStats:
   queryPlansCache: 100
   maxErrors: 100
   maxErrorAge: 300000
-
 # LSN check configuration for replication failover auto mode (in milliseconds)
 # See: https://docs.pgdog.dev/features/load-balancer/replication-failover/
 # lsnCheckDelay: 0        # Set to 0 to start LSN monitoring immediately