diff --git a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_rbac.yaml b/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_rbac.yaml
index bb7966f7..f7d12017 100644
--- a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_rbac.yaml
+++ b/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_rbac.yaml
@@ -4,8 +4,7 @@ kind: Role
 metadata:
   name: rollout-reporter-sa
   labels: 
-    app.kubernetes.io/part-of: rollout-reporter
-    codefresh.io/internal: "true"
+    {{- include "event-reporters.rollout-reporter.labels" . | nindent 4}}
 rules:
   - apiGroups:
       - "*"
@@ -19,8 +18,7 @@ kind: RoleBinding
 metadata:
   name: rollout-reporter-sa
   labels:
-    app.kubernetes.io/part-of: workflow-reporter
-    codefresh.io/internal: "true"
+    {{- include "event-reporters.rollout-reporter.labels" . | nindent 4}}
 roleRef:
   apiGroup: ""
   kind: Role
diff --git a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_rbac.yaml b/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_rbac.yaml
index 38b48031..3ca63fc7 100644
--- a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_rbac.yaml
+++ b/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_rbac.yaml
@@ -18,8 +18,7 @@ kind: RoleBinding
 metadata:
   name: workflow-reporter
   labels:
-    app.kubernetes.io/part-of: workflow-reporter
-    codefresh.io/internal: "true"
+    {{- include "event-reporters.workflow-reporter.labels" . | nindent 4 }}
 roleRef:
   apiGroup: ""
   kind: Role
diff --git a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/clusterrolebinding.yaml b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/clusterrolebinding.yaml
index 78d1eb36..534ac500 100644
--- a/charts/gitops-runtime/templates/event-reporters/rollout-reporter/clusterrolebinding.yaml
+++ b/charts/gitops-runtime/templates/event-reporters/rollout-reporter/clusterrolebinding.yaml
@@ -10,6 +10,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: codefresh-rollouts-reporter
+  labels: 
+    {{- include "event-reporters.rollout-reporter.labels" . | nindent 4}}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/charts/gitops-runtime/templates/eventbus/codefresh-eventbus.yaml b/charts/gitops-runtime/templates/eventbus/codefresh-eventbus.yaml
index 4e773096..1ab63879 100644
--- a/charts/gitops-runtime/templates/eventbus/codefresh-eventbus.yaml
+++ b/charts/gitops-runtime/templates/eventbus/codefresh-eventbus.yaml
@@ -33,7 +33,7 @@ metadata:
   annotations:
     {{- .Values.global.runtime.eventBus.annotations | toYaml | nindent 4}}
   labels:
-    app.kubernetes.io/part-of: argo-events
+    app.kubernetes.io/part-of: codefresh-eventbus
     codefresh.io/internal: "true"
 spec:
   {{- $eventBusSpec | toYaml | nindent 2}}
diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml
index 4ec72dc7..d680a3ad 100644
--- a/charts/gitops-runtime/values.yaml
+++ b/charts/gitops-runtime/values.yaml
@@ -564,14 +564,14 @@ app-proxy:
           tag: 1.1.14-main
   image:
     repository: quay.io/codefresh/cap-app-proxy
-    tag: 1.3680.0
+    tag: 1.3688.0
     pullPolicy: IfNotPresent
   # -- Extra volume mounts for main container
   extraVolumeMounts: []
   initContainer:
     image:
       repository: quay.io/codefresh/cap-app-proxy-init
-      tag: 1.3680.0
+      tag: 1.3688.0
       pullPolicy: IfNotPresent
     command:
       - ./init.sh