diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 808fec3b..8d046414 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -115,9 +115,29 @@ jobs:
             case "$1" in pos-web) echo "web-client-tpos-net" ;; *) echo "${1}-net" ;; esac
           }
 
+          get_kaniko_context() {
+            # pos-web needs root context (Dockerfile references apps/web-client-tpos-net/...)
+            # All other services use subdirectory context (Dockerfile references src/...)
+            case "$1" in
+              pos-web) echo "/workspace/repo" ;;
+              *)       echo "/workspace/repo/$(get_context $1)" ;;
+            esac
+          }
+
+          get_kaniko_dockerfile() {
+            # For root context (pos-web), use full path to Dockerfile
+            # For subdirectory context, Dockerfile is in the context root
+            case "$1" in
+              pos-web) echo "apps/web-client-tpos-net/Dockerfile" ;;
+              *)       echo "Dockerfile" ;;
+            esac
+          }
+
           create_kaniko_job() {
             local svc="$1"
             local ctx=$(get_context "$svc")
+            local kaniko_ctx=$(get_kaniko_context "$svc")
+            local kaniko_dockerfile=$(get_kaniko_dockerfile "$svc")
             local img=$(get_image "$svc")
             local full="${HARBOR}/${PROJECT}/${img}"
             local job="kaniko-${svc}-${IMAGE_TAG}"
@@ -150,8 +170,8 @@ jobs:
                 - name: kaniko
                   image: gcr.io/kaniko-project/executor:latest
                   args:
-                  - "--dockerfile=Dockerfile"
-                  - "--context=/workspace/repo/${ctx}"
+                  - "--dockerfile=${kaniko_dockerfile}"
+                  - "--context=${kaniko_ctx}"
                   - "--destination=${full}:${IMAGE_TAG}"
                   - "--destination=${full}:latest"
                   - "--cache=false"
diff --git a/apps/web-client-tpos-net/Dockerfile b/apps/web-client-tpos-net/Dockerfile
index 87183e7c..4f356921 100644
--- a/apps/web-client-tpos-net/Dockerfile
+++ b/apps/web-client-tpos-net/Dockerfile
@@ -77,3 +77,4 @@ ENTRYPOINT ["dotnet", "WebClientTpos.Server.dll"]
 # Build v3 1775834045
 # Build v4 1775835811
 # Build v5 1775838916
+# Build v6 1775840642
diff --git a/services/ads-analytics-service-net/Dockerfile b/services/ads-analytics-service-net/Dockerfile
index 3e9cd782..486a605d 100644
--- a/services/ads-analytics-service-net/Dockerfile
+++ b/services/ads-analytics-service-net/Dockerfile
@@ -70,3 +70,4 @@ ENTRYPOINT ["dotnet", "AdsAnalyticsService.API.dll"]
 # Build v3 1775834045
 # Build v4 1775835811
 # Build v5 1775838916
+# Build v6 1775840642
diff --git a/services/ads-billing-service-net/Dockerfile b/services/ads-billing-service-net/Dockerfile
index a4216765..23e8eda1 100644
--- a/services/ads-billing-service-net/Dockerfile
+++ b/services/ads-billing-service-net/Dockerfile
@@ -70,3 +70,4 @@ ENTRYPOINT ["dotnet", "AdsBillingService.API.dll"]
 # Build v3 1775834045
 # Build v4 1775835811
 # Build v5 1775838916
+# Build v6 1775840642
diff --git a/services/ads-manager-service-net/Dockerfile b/services/ads-manager-service-net/Dockerfile
index 88ddb698..2bbcb6be 100644
--- a/services/ads-manager-service-net/Dockerfile
+++ b/services/ads-manager-service-net/Dockerfile
@@ -70,3 +70,4 @@ ENTRYPOINT ["dotnet", "AdsManagerService.API.dll"]
 # Build v3 1775834045
 # Build v4 1775835811
 # Build v5 1775838916
+# Build v6 1775840642
diff --git a/services/ads-serving-service-net/Dockerfile b/services/ads-serving-service-net/Dockerfile
index 11276e7b..d928bc57 100644
--- a/services/ads-serving-service-net/Dockerfile
+++ b/services/ads-serving-service-net/Dockerfile
@@ -70,3 +70,4 @@ ENTRYPOINT ["dotnet", "AdsServingService.API.dll"]
 # Build v3 1775834045
 # Build v4 1775835811
 # Build v5 1775838916
+# Build v6 1775840642
diff --git a/services/ads-tracking-service-net/Dockerfile b/services/ads-tracking-service-net/Dockerfile
index 3b5fa3c6..eb4e68bc 100644
--- a/services/ads-tracking-service-net/Dockerfile
+++ b/services/ads-tracking-service-net/Dockerfile
@@ -79,3 +79,4 @@ ENTRYPOINT ["dotnet", "AdsTrackingService.API.dll"]
 # Build v3 1775834045
 # Build v4 1775835811
 # Build v5 1775838916
+# Build v6 1775840642
diff --git a/services/mkt-facebook-service-net/Dockerfile b/services/mkt-facebook-service-net/Dockerfile
index 76e35de3..43e824b8 100644
--- a/services/mkt-facebook-service-net/Dockerfile
+++ b/services/mkt-facebook-service-net/Dockerfile
@@ -70,3 +70,4 @@ ENTRYPOINT ["dotnet", "FacebookService.API.dll"]
 # Build v3 1775834045
 # Build v4 1775835811
 # Build v5 1775838916
+# Build v6 1775840642
diff --git a/services/mkt-whatsapp-service-net/Dockerfile b/services/mkt-whatsapp-service-net/Dockerfile
index da7eeaf7..4dd9ca53 100644
--- a/services/mkt-whatsapp-service-net/Dockerfile
+++ b/services/mkt-whatsapp-service-net/Dockerfile
@@ -70,3 +70,4 @@ ENTRYPOINT ["dotnet", "WhatsAppService.API.dll"]
 # Build v3 1775834045
 # Build v4 1775835811
 # Build v5 1775838916
+# Build v6 1775840642
diff --git a/services/mkt-x-service-net/Dockerfile b/services/mkt-x-service-net/Dockerfile
index ad3a1946..452f825d 100644
--- a/services/mkt-x-service-net/Dockerfile
+++ b/services/mkt-x-service-net/Dockerfile
@@ -70,3 +70,4 @@ ENTRYPOINT ["dotnet", "MktXService.API.dll"]
 # Build v3 1775834045
 # Build v4 1775835811
 # Build v5 1775838916
+# Build v6 1775840642
diff --git a/services/mkt-zalo-service-net/Dockerfile b/services/mkt-zalo-service-net/Dockerfile
index e8980def..335be5b7 100644
--- a/services/mkt-zalo-service-net/Dockerfile
+++ b/services/mkt-zalo-service-net/Dockerfile
@@ -70,3 +70,4 @@ ENTRYPOINT ["dotnet", "MktZaloService.API.dll"]
 # Build v3 1775834045
 # Build v4 1775835811
 # Build v5 1775838916
+# Build v6 1775840642