diff --git a/helmfile/configs/e2e/adapters/cl-deployment/adapter-task-config.yaml b/helmfile/configs/e2e/adapters/cl-deployment/adapter-task-config.yaml
index 406ae4e..a7b78bd 100644
--- a/helmfile/configs/e2e/adapters/cl-deployment/adapter-task-config.yaml
+++ b/helmfile/configs/e2e/adapters/cl-deployment/adapter-task-config.yaml
@@ -6,6 +6,10 @@ params:
     source: "event.id"
     type: "string"
     required: true
+  - name: "runId"
+    source: "env.RUN_ID"
+    type: "string"
+    required: false
 
 # Preconditions with valid operators and CEL expressions
 preconditions:
diff --git a/helmfile/configs/e2e/adapters/cl-deployment/adapter-task-resource-deployment.yaml b/helmfile/configs/e2e/adapters/cl-deployment/adapter-task-resource-deployment.yaml
index 6f66b37..91ec6da 100644
--- a/helmfile/configs/e2e/adapters/cl-deployment/adapter-task-resource-deployment.yaml
+++ b/helmfile/configs/e2e/adapters/cl-deployment/adapter-task-resource-deployment.yaml
@@ -7,6 +7,9 @@ metadata:
   labels:
     hyperfleet.io/cluster-id: "{{ .clusterId }}"
     hyperfleet.io/resource-type: "deployment"
+{{ if .runId }}
+    e2e.hyperfleet.io/run-id: "{{ .runId }}"
+{{ end }}
   annotations:
     hyperfleet.io/generation: "{{ .generationSpec }}"
 spec:
@@ -15,11 +18,17 @@ spec:
     matchLabels:
       app: test
       hyperfleet.io/cluster-id: "{{ .clusterId }}"
+{{ if .runId }}
+      e2e.hyperfleet.io/run-id: "{{ .runId }}"
+{{ end }}
   template:
     metadata:
       labels:
         app: test
         hyperfleet.io/cluster-id: "{{ .clusterId }}"
+{{ if .runId }}
+        e2e.hyperfleet.io/run-id: "{{ .runId }}"
+{{ end }}
     spec:
       containers:
         - name: test
diff --git a/helmfile/configs/e2e/adapters/cl-job/adapter-task-config.yaml b/helmfile/configs/e2e/adapters/cl-job/adapter-task-config.yaml
index a59aac1..c60db31 100644
--- a/helmfile/configs/e2e/adapters/cl-job/adapter-task-config.yaml
+++ b/helmfile/configs/e2e/adapters/cl-job/adapter-task-config.yaml
@@ -6,6 +6,10 @@ params:
     source: "event.id"
     type: "string"
     required: true
+  - name: "runId"
+    source: "env.RUN_ID"
+    type: "string"
+    required: false
 
 # Preconditions with valid operators and CEL expressions
 preconditions:
diff --git a/helmfile/configs/e2e/adapters/cl-job/adapter-task-resource-job.yaml b/helmfile/configs/e2e/adapters/cl-job/adapter-task-resource-job.yaml
index bf61887..4c4a536 100644
--- a/helmfile/configs/e2e/adapters/cl-job/adapter-task-resource-job.yaml
+++ b/helmfile/configs/e2e/adapters/cl-job/adapter-task-resource-job.yaml
@@ -7,12 +7,20 @@ metadata:
   labels:
     hyperfleet.io/cluster-id: "{{ .clusterId }}"
     hyperfleet.io/resource-type: "job"
+{{ if .runId }}
+    e2e.hyperfleet.io/run-id: "{{ .runId }}"
+{{ end }}
     app: test-job
   annotations:
     hyperfleet.io/generation: "{{ .generationSpec }}"
 spec:
   backoffLimit: 0
   template:
+    metadata:
+      labels:
+{{ if .runId }}
+        e2e.hyperfleet.io/run-id: "{{ .runId }}"
+{{ end }}
     spec:
       restartPolicy: Never
       containers:
diff --git a/helmfile/configs/e2e/adapters/cl-maestro/adapter-task-config.yaml b/helmfile/configs/e2e/adapters/cl-maestro/adapter-task-config.yaml
index 8978adf..f7aa8db 100644
--- a/helmfile/configs/e2e/adapters/cl-maestro/adapter-task-config.yaml
+++ b/helmfile/configs/e2e/adapters/cl-maestro/adapter-task-config.yaml
@@ -17,6 +17,11 @@ params:
     source: "env.NAMESPACE"
     type: "string"
 
+  - name: "runId"
+    source: "env.RUN_ID"
+    type: "string"
+    required: false
+
 # Preconditions with valid operators and CEL expressions
 preconditions:
   - name: "clusterStatus"
diff --git a/helmfile/configs/e2e/adapters/cl-maestro/adapter-task-resource-manifestwork.yaml b/helmfile/configs/e2e/adapters/cl-maestro/adapter-task-resource-manifestwork.yaml
index 87dd7a8..5f3aae4 100644
--- a/helmfile/configs/e2e/adapters/cl-maestro/adapter-task-resource-manifestwork.yaml
+++ b/helmfile/configs/e2e/adapters/cl-maestro/adapter-task-resource-manifestwork.yaml
@@ -30,6 +30,9 @@ metadata:
 {{ if .platformType }}
     hyperfleet.io/platform-type: "{{ .platformType }}"
 {{ end }}
+{{ if .runId }}
+    e2e.hyperfleet.io/run-id: "{{ .runId }}"
+{{ end }}
 
   # Annotations for metadata and operational information
   annotations:
@@ -65,6 +68,9 @@ spec:
           app.kubernetes.io/instance: "{{ .adapter.name }}"
           app.kubernetes.io/name: cl-maestro
           app.kubernetes.io/transport: maestro
+{{ if .runId }}
+          e2e.hyperfleet.io/run-id: "{{ .runId }}"
+{{ end }}
         annotations:
           hyperfleet.io/generation: "{{ .generation }}"
     - apiVersion: v1
@@ -91,6 +97,9 @@ spec:
           app.kubernetes.io/name: cl-maestro
           app.kubernetes.io/version: 1.0.0
           app.kubernetes.io/transport: maestro
+{{ if .runId }}
+          e2e.hyperfleet.io/run-id: "{{ .runId }}"
+{{ end }}
         annotations:
           hyperfleet.io/generation: "{{ .generation }}"
 
diff --git a/helmfile/configs/e2e/adapters/cl-namespace/adapter-task-config.yaml b/helmfile/configs/e2e/adapters/cl-namespace/adapter-task-config.yaml
index fc519bd..2991509 100644
--- a/helmfile/configs/e2e/adapters/cl-namespace/adapter-task-config.yaml
+++ b/helmfile/configs/e2e/adapters/cl-namespace/adapter-task-config.yaml
@@ -16,6 +16,10 @@ params:
     type: "string"
     required: false
     default: "false"
+  - name: "runId"
+    source: "env.RUN_ID"
+    type: "string"
+    required: false
 
 # Preconditions with valid operators and CEL expressions
 preconditions:
@@ -67,6 +71,7 @@ resources:
           e2e.hyperfleet.io/test-run-id: "{{ .testRunId }}"
           e2e.hyperfleet.io/ci: "{{ .ci }}"
           e2e.hyperfleet.io/managed-by: "test-framework"
+          e2e.hyperfleet.io/run-id: "{{ .runId }}"
         annotations:
           hyperfleet.io/generation: "{{ .generationSpec }}"
     discovery:
diff --git a/helmfile/configs/e2e/adapters/np-configmap/adapter-task-config.yaml b/helmfile/configs/e2e/adapters/np-configmap/adapter-task-config.yaml
index 0e56379..1447d1f 100644
--- a/helmfile/configs/e2e/adapters/np-configmap/adapter-task-config.yaml
+++ b/helmfile/configs/e2e/adapters/np-configmap/adapter-task-config.yaml
@@ -10,6 +10,10 @@ params:
     source: "event.id"
     type: "string"
     required: true
+  - name: "runId"
+    source: "env.RUN_ID"
+    type: "string"
+    required: false
 
 # Preconditions with valid operators and CEL expressions
 preconditions:
diff --git a/helmfile/configs/e2e/adapters/np-configmap/adapter-task-resource-configmap.yaml b/helmfile/configs/e2e/adapters/np-configmap/adapter-task-resource-configmap.yaml
index 750344b..3427c90 100644
--- a/helmfile/configs/e2e/adapters/np-configmap/adapter-task-resource-configmap.yaml
+++ b/helmfile/configs/e2e/adapters/np-configmap/adapter-task-resource-configmap.yaml
@@ -9,6 +9,9 @@ metadata:
     hyperfleet.io/nodepool-id: "{{ .nodepoolId }}"
     hyperfleet.io/nodepool-name: "{{ .nodepoolName }}"
     hyperfleet.io/resource-type: "configmap"
+{{ if .runId }}
+    e2e.hyperfleet.io/run-id: "{{ .runId }}"
+{{ end }}
   annotations:
     hyperfleet.io/generation: "{{ .generationSpec }}"
 data:
diff --git a/helmfile/helmfile.yaml.gotmpl b/helmfile/helmfile.yaml.gotmpl
index 4852c35..cf5391f 100644
--- a/helmfile/helmfile.yaml.gotmpl
+++ b/helmfile/helmfile.yaml.gotmpl
@@ -74,7 +74,7 @@ releases:
   # HyperFleet API
   - name: hyperfleet-api
     namespace: {{ .Values.namespace }}
-    chart: hyperfleet-api/hyperfleet-api 
+    chart: hyperfleet-api/hyperfleet-api
     labels:
       component: api
     values:
diff --git a/helmfile/values/base-adapter.yaml.gotmpl b/helmfile/values/base-adapter.yaml.gotmpl
index 3600936..d4fdcce 100644
--- a/helmfile/values/base-adapter.yaml.gotmpl
+++ b/helmfile/values/base-adapter.yaml.gotmpl
@@ -6,6 +6,7 @@ image:
   tag: {{ env "ADAPTER_IMAGE_TAG" | default "dev" }}
   pullPolicy: {{ env "IMAGE_PULL_POLICY" | default "IfNotPresent" }}
 
+
 adapterConfig:
   log:
     level: debug
@@ -30,3 +31,5 @@ env:
     valueFrom:
       fieldRef:
         fieldPath: metadata.namespace
+  - name: RUN_ID
+    value: {{ env "RUN_ID" | default "unknown" }}