diff --git a/charts/gitops-runtime/templates/_components/cap-app-proxy/_helpers.tpl b/charts/gitops-runtime/templates/_components/cap-app-proxy/_helpers.tpl
index d04b834ff..957280bf9 100644
--- a/charts/gitops-runtime/templates/_components/cap-app-proxy/_helpers.tpl
+++ b/charts/gitops-runtime/templates/_components/cap-app-proxy/_helpers.tpl
@@ -26,6 +26,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: app-proxy
 codefresh.io/internal: "true"
+codefresh.io/runtime-name: {{ .Values.global.runtime.name | quote }}
 {{- end }}
 
 {{/*
diff --git a/charts/gitops-runtime/templates/_components/gitops-operator/_helpers.tpl b/charts/gitops-runtime/templates/_components/gitops-operator/_helpers.tpl
index be68f36d1..910b9bd33 100644
--- a/charts/gitops-runtime/templates/_components/gitops-operator/_helpers.tpl
+++ b/charts/gitops-runtime/templates/_components/gitops-operator/_helpers.tpl
@@ -26,6 +26,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: gitops-operator
 codefresh.io/internal: "true"
+codefresh.io/runtime-name: {{ .Values.global.runtime.name | quote }}
 {{- end }}
 
 {{/*
diff --git a/charts/gitops-runtime/templates/_components/internal-router/_helpers.tpl b/charts/gitops-runtime/templates/_components/internal-router/_helpers.tpl
index ec7615a62..252e70e5c 100644
--- a/charts/gitops-runtime/templates/_components/internal-router/_helpers.tpl
+++ b/charts/gitops-runtime/templates/_components/internal-router/_helpers.tpl
@@ -41,6 +41,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: internal-router
+codefresh.io/runtime-name: {{ .Values.global.runtime.name | quote }}
 {{- end }}
 
 {{/*
diff --git a/charts/gitops-runtime/templates/argo-gateway/_helpers.tpl b/charts/gitops-runtime/templates/argo-gateway/_helpers.tpl
index 458a805da..c362b1515 100644
--- a/charts/gitops-runtime/templates/argo-gateway/_helpers.tpl
+++ b/charts/gitops-runtime/templates/argo-gateway/_helpers.tpl
@@ -27,6 +27,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: argo-gateway
 app.kubernetes.io/component: argo-gateway
 codefresh.io/internal: "true"
+codefresh.io/runtime-name: {{ .Values.global.runtime.name | quote }}
 {{- end }}
 
 {{/*
diff --git a/charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/_helpers.tpl b/charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/_helpers.tpl
index c7a10fdc8..030b76fc4 100644
--- a/charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/_helpers.tpl
+++ b/charts/gitops-runtime/templates/event-reporters/cluster-event-reporter/_helpers.tpl
@@ -27,6 +27,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: cluster-event-reporter
 app.kubernetes.io/component: cluster-event-reporter
 codefresh.io/internal: "true"
+codefresh.io/runtime-name: {{ .Values.global.runtime.name | quote }}
 {{- end }}
 
 {{/*
diff --git a/charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/_helpers.tpl b/charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/_helpers.tpl
index 858973195..3fa8318a1 100644
--- a/charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/_helpers.tpl
+++ b/charts/gitops-runtime/templates/event-reporters/runtime-event-reporter/_helpers.tpl
@@ -27,6 +27,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: runtime-event-reporter
 app.kubernetes.io/component: runtime-event-reporter
 codefresh.io/internal: "true"
+codefresh.io/runtime-name: {{ .Values.global.runtime.name | quote }}
 {{- end }}
 
 {{/*
diff --git a/charts/gitops-runtime/templates/redis/_helpers.tpl b/charts/gitops-runtime/templates/redis/_helpers.tpl
index f88953254..76e0d75e5 100644
--- a/charts/gitops-runtime/templates/redis/_helpers.tpl
+++ b/charts/gitops-runtime/templates/redis/_helpers.tpl
@@ -26,6 +26,7 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: redis
 codefresh.io/internal: "true"
+codefresh.io/runtime-name: {{ .Values.global.runtime.name | quote }}
 {{- end }}
 
 {{/*