diff --git a/charts/oes/Chart.yaml b/charts/oes/Chart.yaml
index d48a0a59..dbf9bcea 100644
--- a/charts/oes/Chart.yaml
+++ b/charts/oes/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: oes
-version: 4.0.20
+version: 4.0.21
 appVersion: 4.0.4.2
 description: "ISD and Spinnaker with v1.30.1 with ISD custom Labels"
 icon: https://raw.githubusercontent.com/OpsMx/enterprise-spinnaker/master/img/opsmx.png
diff --git a/charts/oes/templates/deployments/oes-autopilot-deployment.yaml b/charts/oes/templates/deployments/oes-autopilot-deployment.yaml
index 34836f44..6207c1f1 100644
--- a/charts/oes/templates/deployments/oes-autopilot-deployment.yaml
+++ b/charts/oes/templates/deployments/oes-autopilot-deployment.yaml
@@ -24,6 +24,7 @@ spec:
 {{- end }}
       labels:
 {{ toYaml .Values.autopilot.labels | indent 8 }}
+{{ include "oes.standard-labels" . | indent 8 }}
     spec:
       volumes:
         - name: autopilot-config-volume
diff --git a/charts/oes/templates/deployments/oes-platform-deployment.yaml b/charts/oes/templates/deployments/oes-platform-deployment.yaml
index 54a55379..a0a8deb7 100644
--- a/charts/oes/templates/deployments/oes-platform-deployment.yaml
+++ b/charts/oes/templates/deployments/oes-platform-deployment.yaml
@@ -5,6 +5,7 @@ metadata:
   annotations:
     app: oes
     component: platform
+{{ include "isd.standard-annotations" . | indent 4 }}
   labels:
 {{ toYaml .Values.platform.labels | indent 4 }}
 {{ include "oes.standard-labels" . | indent 4 }}
diff --git a/charts/oes/templates/deployments/oes-rabbitmq-deployment.yaml b/charts/oes/templates/deployments/oes-rabbitmq-deployment.yaml
index 633cae68..b85efad6 100644
--- a/charts/oes/templates/deployments/oes-rabbitmq-deployment.yaml
+++ b/charts/oes/templates/deployments/oes-rabbitmq-deployment.yaml
@@ -22,8 +22,7 @@ spec:
 {{ toYaml .Values.rabbitmq.annotations | nindent 8 }}
 {{- end }}
       labels:
-        app: oes
-        component: rabbitmq
+{{ toYaml .Values.rabbitmq.labels | indent 8 }}
 {{ include "oes.standard-labels" . | indent 8 }}
     spec:
       containers:
diff --git a/charts/oes/templates/deployments/opa-deployment.yaml b/charts/oes/templates/deployments/opa-deployment.yaml
index 8a8a5b4b..0309c3c3 100644
--- a/charts/oes/templates/deployments/opa-deployment.yaml
+++ b/charts/oes/templates/deployments/opa-deployment.yaml
@@ -21,7 +21,7 @@ spec:
 {{ toYaml .Values.opa.annotations | nindent 8 }}
 {{- end }}
       labels:
-        app: opa
+{{ toYaml .Values.opa.labels | indent 8 }}
 {{ include "oes.standard-labels" . | indent 8 }}
       name: opa
     spec:
diff --git a/charts/oes/values.yaml b/charts/oes/values.yaml
index b3121a1a..e4fcae62 100644
--- a/charts/oes/values.yaml
+++ b/charts/oes/values.yaml
@@ -660,7 +660,9 @@ rabbitmq:
   image:
     registry: quay.io/opsmxpublic/rabbitmq
     repository: 3-management
-
+  labels:  #If Required,Add Customer-specific labels as well
+    app: oes
+    component: rabbitmq
   annotations:
     moniker.spinnaker.io/application: isd
 
@@ -1291,6 +1293,8 @@ opa:
     pullPolicy: IfNotPresent
   annotations:
     moniker.spinnaker.io/application: isd
+  labels:  #If Required,Add Customer-specific labels as well
+    app: oes
 
 ####################################################
 # AP installs a trial LDAP for POCs and testing purposes