diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index a0d653b..58e8f1a 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -120,11 +120,12 @@ jobs:
     - name: Log in to GHCR
       run: echo "${{ secrets.GITHUB_TOKEN }}" | helm registry login ghcr.io -u ${{ github.actor }} --password-stdin
 
-    - name: Update chart version
+    - name: Update chart version and image tags
       run: |
         VERSION=${{ needs.semantic-release.outputs.version }}
         sed -i "s/^version:.*/version: ${VERSION}/" .helm/Chart.yaml
         sed -i "s/^appVersion:.*/appVersion: \"${VERSION}\"/" .helm/Chart.yaml
+        sed -i "s/    tag: latest/    tag: ${VERSION}/" .helm/values.yaml
 
     - name: Package and push
       run: |
diff --git a/.helm/values.yaml b/.helm/values.yaml
index 70735ce..d5dbbd4 100644
--- a/.helm/values.yaml
+++ b/.helm/values.yaml
@@ -2,7 +2,7 @@ admin:
   image:
     repository: ghcr.io/pazter1101/patchnotes-admin
     tag: latest
-    pullPolicy: Always
+    pullPolicy: IfNotPresent
   replicas: 1
   resources:
     requests:
@@ -25,7 +25,7 @@ mkdocs:
   image:
     repository: ghcr.io/pazter1101/patchnotes-mkdocs
     tag: latest
-    pullPolicy: Always
+    pullPolicy: IfNotPresent
   replicas: 1
   resources:
     requests: