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..f75e6b834 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,9 @@ 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"
+{{- with .Values.global.additionalLabels }}
+{{- toYaml . | nindent 0 }}
+{{- end }}
 {{- 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..a005c17c4 100644
--- a/charts/gitops-runtime/templates/_components/gitops-operator/_helpers.tpl
+++ b/charts/gitops-runtime/templates/_components/gitops-operator/_helpers.tpl
@@ -26,6 +26,9 @@ 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"
+{{- with .Values.global.additionalLabels }}
+{{- toYaml . | nindent 0 }}
+{{- end }}
 {{- 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..f85f6b021 100644
--- a/charts/gitops-runtime/templates/_components/internal-router/_helpers.tpl
+++ b/charts/gitops-runtime/templates/_components/internal-router/_helpers.tpl
@@ -41,6 +41,9 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: internal-router
+{{- with .Values.global.additionalLabels }}
+{{- toYaml . | nindent 0 }}
+{{- end }}
 {{- end }}
 
 {{/*
diff --git a/charts/gitops-runtime/templates/_helpers.tpl b/charts/gitops-runtime/templates/_helpers.tpl
index d08038632..92bafbff5 100644
--- a/charts/gitops-runtime/templates/_helpers.tpl
+++ b/charts/gitops-runtime/templates/_helpers.tpl
@@ -49,6 +49,9 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: codefresh-gitops-runtime
 codefresh.io/runtime-name: {{ .Values.global.runtime.name | quote }}
+{{- with .Values.global.additionalLabels }}
+{{- toYaml . | nindent 0 }}
+{{- end }}
 {{- end }}
 
 {{/*
diff --git a/charts/gitops-runtime/templates/argo-gateway/_helpers.tpl b/charts/gitops-runtime/templates/argo-gateway/_helpers.tpl
index 458a805da..4bfba22c6 100644
--- a/charts/gitops-runtime/templates/argo-gateway/_helpers.tpl
+++ b/charts/gitops-runtime/templates/argo-gateway/_helpers.tpl
@@ -27,6 +27,9 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: argo-gateway
 app.kubernetes.io/component: argo-gateway
 codefresh.io/internal: "true"
+{{- with .Values.global.additionalLabels }}
+{{- toYaml . | nindent 0 }}
+{{- end }}
 {{- 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..82174a12e 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,9 @@ 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"
+{{- with .Values.global.additionalLabels }}
+{{- toYaml . | nindent 0 }}
+{{- end }}
 {{- 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..33db0e5be 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,9 @@ 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"
+{{- with .Values.global.additionalLabels }}
+{{- toYaml . | nindent 0 }}
+{{- end }}
 {{- end }}
 
 {{/*
diff --git a/charts/gitops-runtime/templates/redis/_helpers.tpl b/charts/gitops-runtime/templates/redis/_helpers.tpl
index f88953254..d4b368b6a 100644
--- a/charts/gitops-runtime/templates/redis/_helpers.tpl
+++ b/charts/gitops-runtime/templates/redis/_helpers.tpl
@@ -26,6 +26,9 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/part-of: redis
 codefresh.io/internal: "true"
+{{- with .Values.global.additionalLabels }}
+{{- toYaml . | nindent 0 }}
+{{- end }}
 {{- end }}
 
 {{/*
diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml
index c2c0f5584..696d6fb47 100644
--- a/charts/gitops-runtime/values.yaml
+++ b/charts/gitops-runtime/values.yaml
@@ -136,6 +136,10 @@ global:
   # -- global NO_PROXY for all components
   noProxy: ''
   imageRegistry: ""
+  # -- Additional labels applied to all resources
+  additionalLabels:
+    codefresh.io/runtime-component: "true"
+  # -- Additional labels applied to argo cd rollout reporter deployment
   # -- Global settings for event reporters
   # Event reporters are used for reporting runtime and cluster resources to Codefresh platform
   event-reporters:
@@ -248,6 +252,9 @@ installer:
 sealed-secrets:
   fullnameOverride: sealed-secrets-controller
   keyrenewperiod: "720h"
+  # -- Common labels applied to all sealed-secrets resources
+  commonLabels:
+    codefresh.io/runtime-component: "true"
   image:
     registry: 'quay.io'
     repository: 'codefresh/sealed-secrets-controller'
@@ -317,6 +324,9 @@ argo-events:
 argo-workflows:
   fullnameOverride: argo
   enabled: true
+  # -- Common labels applied to all argo-workflows resources
+  commonLabels:
+    codefresh.io/runtime-component: "true"
   # -- Restrict Argo Workflows to operate only in a single namespace (the namespace of the Helm release).
   # This ensures it does not interfere with any other instances of Argo Workflows installed on your cluster.
   singleNamespace: true
@@ -867,6 +877,9 @@ redis-ha:
   enabled: false
   # -- Full name of the Redis HA Resources
   fullnameOverride: "runtime-redis-ha"
+  # -- Extra selector labels applied to redis-ha resources
+  extraSelectorLabels:
+    codefresh.io/runtime-component: "true"
   ## Redis image
   image:
     # -- Redis repository