diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml
index 481f9a6f..9b9a07cb 100644
--- a/.github/workflows/semantic-release.yml
+++ b/.github/workflows/semantic-release.yml
@@ -79,46 +79,6 @@ jobs:
             echo "ℹ️  No new release published"
           fi
 
-      - name: update-helm-values
-        if: steps.semantic-release.outputs.new-release-published == 'true'
-        run: |
-          echo "🔍 Debug: new-release-published = ${{ steps.semantic-release.outputs.new-release-published }}"
-          echo "🔍 Debug: new-release-version = ${{ steps.semantic-release.outputs.new-release-version }}"
-
-          NEW_VERSION="${{ steps.semantic-release.outputs.new-release-version }}"
-          VALUES_FILE="infrastructure/rag/values.yaml"
-
-          # Update Helm values using Python script
-          pip install ruamel.yaml
-          python3 tools/update-helm-values.py "$NEW_VERSION"
-
-          # Show git diff for verification
-          if ! git diff --quiet "$VALUES_FILE"; then
-            echo "Changes made to values.yaml:"
-            git diff "$VALUES_FILE"
-          else
-            echo "⚠️  No changes detected in values.yaml"
-          fi
-
-      - name: commit-helm-changes
-        if: steps.semantic-release.outputs.new-release-published == 'true'
-        run: |
-          # Check if there are changes to commit
-          if ! git diff --quiet infrastructure/rag/values.yaml; then
-            echo "📝 Committing Helm values changes..."
-            git config --local user.email "action@github.com"
-            git config --local user.name "GitHub Action"
-            git add infrastructure/rag/values.yaml
-
-            # Create a new commit for the Helm changes (don't amend since semantic-release already pushed)
-            git commit -m "chore: update helm chart image tags to v${{ steps.semantic-release.outputs.new-release-version }}"
-            git push
-
-            echo "✅ Helm chart changes committed and pushed"
-          else
-            echo "ℹ️  No Helm chart changes to commit"
-          fi
-
   build-and-push-images:
     name: build-and-push-images
     runs-on: ubuntu-latest
@@ -194,4 +154,3 @@ jobs:
           echo "- frontend" >> $GITHUB_STEP_SUMMARY
           echo "- admin-frontend" >> $GITHUB_STEP_SUMMARY
           echo "**Registry:** ghcr.io/${{ github.repository_owner }}/rag-template" >> $GITHUB_STEP_SUMMARY
-          echo "**Helm chart updated:** infrastructure/rag/values.yaml" >> $GITHUB_STEP_SUMMARY
diff --git a/Makefile b/Makefile
index 1a28a53c..183c3c2e 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@ IMAGE_TAG?=v1.0.0
 REGISTRY?=
 
 build_and_push:
-	docker buildx build --platform linux/amd64 -t $(REGISTRY)/rag-backend:$(IMAGE_TAG)  -f services/rag-backend/Dockerfile --push  .
-	docker buildx build --platform linux/amd64 -t $(REGISTRY)/admin-backend:$(IMAGE_TAG)  -f services/admin-backend/Dockerfile --push .
-	docker buildx build --platform linux/amd64 -t $(REGISTRY)/document-extractor:$(IMAGE_TAG)  -f services/document-extractor/Dockerfile --push .
-	docker buildx build --platform linux/amd64 -t $(REGISTRY)/frontend:$(IMAGE_TAG)  -f services/frontend/apps/chat-app/Dockerfile --push .
-	docker buildx build --platform linux/amd64 -t $(REGISTRY)/admin-frontend:$(IMAGE_TAG)  -f services/frontend/apps/admin-app/Dockerfile --push .
-	docker buildx build --platform linux/amd64 -t $(REGISTRY)/mcp-server:$(IMAGE_TAG)  -f services/mcp-server/Dockerfile --push .
+	docker buildx build --platform linux/amd64 -t $(REGISTRY)/rag-backend:$(IMAGE_TAG) -t $(REGISTRY)/rag-backend:latest -f services/rag-backend/Dockerfile --push  .
+	docker buildx build --platform linux/amd64 -t $(REGISTRY)/admin-backend:$(IMAGE_TAG) -t $(REGISTRY)/admin-backend:latest -f services/admin-backend/Dockerfile --push .
+	docker buildx build --platform linux/amd64 -t $(REGISTRY)/document-extractor:$(IMAGE_TAG) -t $(REGISTRY)/document-extractor:latest -f services/document-extractor/Dockerfile --push .
+	docker buildx build --platform linux/amd64 -t $(REGISTRY)/frontend:$(IMAGE_TAG) -t $(REGISTRY)/frontend:latest -f services/frontend/apps/chat-app/Dockerfile --push .
+	docker buildx build --platform linux/amd64 -t $(REGISTRY)/admin-frontend:$(IMAGE_TAG) -t $(REGISTRY)/admin-frontend:latest -f services/frontend/apps/admin-app/Dockerfile --push .
+	docker buildx build --platform linux/amd64 -t $(REGISTRY)/mcp-server:$(IMAGE_TAG) -t $(REGISTRY)/mcp-server:latest -f services/mcp-server/Dockerfile --push .
diff --git a/infrastructure/rag/values.yaml b/infrastructure/rag/values.yaml
index cfc0a3ae..ac0e0160 100644
--- a/infrastructure/rag/values.yaml
+++ b/infrastructure/rag/values.yaml
@@ -70,7 +70,7 @@ backend:
     image:
       repository: ghcr.io/stackitcloud/rag-template/mcp-server
       pullPolicy: Always
-      tag: "v2.0.0"
+      tag: "latest"
 
   name: backend
   replicaCount: 1
@@ -78,7 +78,7 @@ backend:
   image:
     repository: ghcr.io/stackitcloud/rag-template/rag-backend
     pullPolicy: Always
-    tag: "v2.0.0"
+    tag: "latest"
 
   command:
   - "poetry"
@@ -216,7 +216,7 @@ frontend:
   image:
     repository: ghcr.io/stackitcloud/rag-template/frontend
     pullPolicy: Always
-    tag: "v2.0.0"
+    tag: "latest"
 
   service:
     type: ClusterIP
@@ -251,7 +251,7 @@ adminBackend:
   image:
     repository: ghcr.io/stackitcloud/rag-template/admin-backend
     pullPolicy: Always
-    tag: "v2.0.0"
+    tag: "latest"
 
   command:
   - "poetry"
@@ -331,7 +331,7 @@ extractor:
   image:
     repository: ghcr.io/stackitcloud/rag-template/document-extractor
     pullPolicy: Always
-    tag: "v2.0.0"
+    tag: "latest"
 
   command:
   - "poetry"
@@ -379,7 +379,7 @@ adminFrontend:
   image:
     repository: ghcr.io/stackitcloud/rag-template/admin-frontend
     pullPolicy: Always
-    tag: "v2.0.0"
+    tag: "latest"
 
   service:
     type: ClusterIP