diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
index ff5143a..f0337ce 100644
--- a/.github/workflows/build-and-push.yaml
+++ b/.github/workflows/build-and-push.yaml
@@ -47,8 +47,7 @@ jobs:
             type=ref,event=pr
             type=sha,prefix=sha-
             type=raw,value=latest,enable={{is_default_branch}}
-            # Development tags for serverless features
-            type=raw,value=2.0.0-dev,enable=${{ github.ref == 'refs/heads/feature/serverless-2.0.0' }}
+            type=raw,value=2.0.0-dev,enable={{is_default_branch}}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
diff --git a/chart/values.yaml b/chart/values.yaml
index 1117e7f..2231c15 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -13,7 +13,7 @@ deploymentMode: persistent  # persistent | dynamic
 # Container image configuration
 image:
   repository: ghcr.io/cpfarhood/devcontainer
-  tag: 2.0.0-dev
+  tag: latest
   pullPolicy: Always
 
 # GitHub repository to clone into /workspace (ignored in dynamic mode - uses URL routing)
@@ -217,7 +217,7 @@ dynamic:
     replicas: 2                    # High availability
     image:
       repository: ghcr.io/cpfarhood/devcontainer-routing-proxy
-      tag: 2.0.0-dev
+      tag: latest
       pullPolicy: Always
 
     resources: