diff --git a/Kubernetes/container-azm-ms-agentconfig.yaml b/Kubernetes/container-azm-ms-agentconfig.yaml
index fdea022b..fc4acbd5 100644
--- a/Kubernetes/container-azm-ms-agentconfig.yaml
+++ b/Kubernetes/container-azm-ms-agentconfig.yaml
@@ -1,7 +1,7 @@
 kind: ConfigMap
 apiVersion: v1
 data:
-  schema-version: 
+  schema-version:
     #string.used by agent to parse config. supported versions are {v1}. Configs with other schema versions will be rejected by the agent.
     v1
   config-version:
diff --git a/Kubernetes/omsagent-ai-res-id.yaml b/Kubernetes/omsagent-ai-res-id.yaml
index cbb42816..2bf9893b 100644
--- a/Kubernetes/omsagent-ai-res-id.yaml
+++ b/Kubernetes/omsagent-ai-res-id.yaml
@@ -7,7 +7,7 @@ metadata:
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
-  name: omsagent-user
+  name: omsagent-reader
 rules:
   - apiGroups: [""]
     resources: ["pods", "events", "nodes", "namespaces", "services"]
@@ -31,7 +31,7 @@ subjects:
     namespace: kube-system
 roleRef:
   kind: ClusterRole
-  name: omsagent-user
+  name: omsagent-reader
   apiGroup: rbac.authorization.k8s.io
 ---
 kind: ConfigMap
@@ -348,6 +348,8 @@ spec:
               value: "my_acs_cluster_name"
             - name: CONTROLLER_TYPE
               value: "DaemonSet"
+            - name: HEALTHMODEL_REPLICASET_SERVICE_ENDPOINT
+              value: "healthmodel-replicaset-service.kube-system"
             - name: NODE_IP
               valueFrom:
                 fieldRef:
diff --git a/Kubernetes/omsagent.yaml b/Kubernetes/omsagent.yaml
index 9916faf3..baf97a8a 100644
--- a/Kubernetes/omsagent.yaml
+++ b/Kubernetes/omsagent.yaml
@@ -7,7 +7,7 @@ metadata:
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
-  name: omsagent-user
+  name: omsagent-reader
 rules:
   - apiGroups: [""]
     resources: ["pods", "events", "nodes", "namespaces", "services"]
@@ -31,7 +31,7 @@ subjects:
     namespace: kube-system
 roleRef:
   kind: ClusterRole
-  name: omsagent-user
+  name: omsagent-reader
   apiGroup: rbac.authorization.k8s.io
 ---
 kind: ConfigMap
@@ -344,6 +344,8 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.hostIP
+            - name: HEALTHMODEL_REPLICASET_SERVICE_ENDPOINT
+              value: "healthmodel-replicaset-service.kube-system"
           securityContext:
             privileged: true
           ports: