diff --git a/incubator/azuremonitor-containers/Chart.yaml b/incubator/azuremonitor-containers/Chart.yaml
index 4a4be930efe5..45726059669d 100644
--- a/incubator/azuremonitor-containers/Chart.yaml
+++ b/incubator/azuremonitor-containers/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 7.0.0-1
 description: Helm chart for deploying Azure Monitor container monitoring agent in Kubernetes
 name: azuremonitor-containers
-version: 2.6.0
+version: 2.6.1
 kubeVersion: "^1.10.0-0"
 keywords:
   - monitoring
diff --git a/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml b/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml
index 5417a43f2562..9b916ed7f045 100644
--- a/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml
+++ b/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml
@@ -56,6 +56,8 @@ spec:
          valueFrom:
             fieldRef:
               fieldPath: status.hostIP
+       - name: USER_ASSIGNED_IDENTITY_CLIENT_ID
+         value: ""
        {{- if .Values.omsagent.logsettings.logflushintervalsecs }}
        - name: FBIT_SERVICE_FLUSH_INTERVAL
          value: {{ .Values.omsagent.logsettings.logflushintervalsecs | quote }}
@@ -103,7 +105,7 @@ spec:
         periodSeconds: 60
    nodeSelector:
     beta.kubernetes.io/os: linux
-   {{- with .Values.omsagent.affinity }}
+   {{- with .Values.omsagent.daemonset.affinity }}
    affinity: {{- toYaml . | nindent 8 }}
    {{- end }}
    {{- with .Values.omsagent.tolerations }}
diff --git a/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml b/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml
index 2cd63aac8368..cd1a28b7ec42 100644
--- a/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml
+++ b/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml
@@ -57,6 +57,8 @@ spec:
          valueFrom:
             fieldRef:
               fieldPath: status.hostIP
+       - name: USER_ASSIGNED_IDENTITY_CLIENT_ID
+         value: ""
        securityContext:
          privileged: true
        ports:
@@ -94,12 +96,12 @@ spec:
         periodSeconds: 60
    nodeSelector:
     beta.kubernetes.io/os: linux
-   {{- with .Values.omsagent.affinity }}
+   {{- with .Values.omsagent.deployment.affinity }}
    affinity: {{- toYaml . | nindent 8 }}
    {{- end }}
    {{- with .Values.omsagent.tolerations }}
    tolerations: {{- toYaml . | nindent 8 }}
-   {{- end }}         
+   {{- end }}
    volumes:
     - name: docker-sock
       hostPath:
diff --git a/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml b/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml
index 2a261d7d3d74..edeb86f60a75 100644
--- a/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml
+++ b/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml
@@ -19,7 +19,7 @@ metadata:
     heritage: {{ .Release.Service }}
 rules:
 - apiGroups: [""]
-  resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "namespaces", "services"]
+  resources: ["pods", "events", "nodes", "nodes/stats", "nodes/metrics", "nodes/spec", "namespaces", "services"]
   verbs: ["list", "get", "watch"]
 - apiGroups: ["apps", "extensions"]
   resources: ["replicasets"]
diff --git a/incubator/azuremonitor-containers/templates/omsagent-rs-configmap.yaml b/incubator/azuremonitor-containers/templates/omsagent-rs-configmap.yaml
index 60edab065977..e3f8ce848e2b 100644
--- a/incubator/azuremonitor-containers/templates/omsagent-rs-configmap.yaml
+++ b/incubator/azuremonitor-containers/templates/omsagent-rs-configmap.yaml
@@ -18,6 +18,7 @@ data:
       tag oms.containerinsights.KubePodInventory
       run_interval 60
       log_level debug
+      custom_metrics_azure_regions eastus,southcentralus,westcentralus,westus2,southeastasia,northeurope,westeurope,southafricanorth,centralus,northcentralus,eastus2,koreacentral,eastasia,centralindia,uksouth,canadacentral,francecentral,japaneast,australiaeast
      </source>
 
      #Kubernetes events
@@ -26,7 +27,7 @@ data:
       tag oms.containerinsights.KubeEvents
       run_interval 60
       log_level debug
-      </source>  
+      </source>
 
      #Kubernetes Nodes
      <source>
@@ -34,7 +35,7 @@ data:
       tag oms.containerinsights.KubeNodeInventory
       run_interval 60
       log_level debug
-     </source>  
+     </source>
 
      #Kubernetes health
      <source>
@@ -82,7 +83,7 @@ data:
       buffer_queue_full_action drop_oldest_chunk
       flush_interval 20s
       retry_limit 10
-      retry_wait 5s      
+      retry_wait 5s
       max_retry_wait 5m
      </match>
 
@@ -99,7 +100,7 @@ data:
       retry_limit 10
       retry_wait 5s
       max_retry_wait 5m
-     </match>   
+     </match>
 
      <match oms.containerinsights.KubeServices**>
       type out_oms
@@ -173,7 +174,7 @@ data:
       retry_limit 10
       retry_wait 30s
       max_retry_wait 9m
-      retry_mdm_post_wait_minutes 60
+      retry_mdm_post_wait_minutes 30
      </match>
 
      <match oms.api.wincadvisorperf**>
@@ -204,7 +205,7 @@ data:
       retry_limit 10
       retry_wait 5s
       max_retry_wait 5m
-      retry_mdm_post_wait_minutes 60
+      retry_mdm_post_wait_minutes 30
      </match>
 
      <match kubehealth.Signals**>
@@ -221,6 +222,21 @@ data:
       retry_wait 5s
       max_retry_wait 5m
      </match>
+
+     <match oms.api.InsightsMetrics**>
+      type out_oms
+      log_level debug
+      num_threads 5
+      buffer_chunk_limit 4m
+      buffer_type file
+      buffer_path %STATE_DIR_WS%/out_oms_insightsmetrics*.buffer
+      buffer_queue_limit 20
+      buffer_queue_full_action drop_oldest_chunk
+      flush_interval 20s
+      retry_limit 10
+      retry_wait 5s
+      max_retry_wait 5m
+    </match>
 metadata:
   name: omsagent-rs-config
   namespace: kube-system
diff --git a/incubator/azuremonitor-containers/values.yaml b/incubator/azuremonitor-containers/values.yaml
index 5c9947f5fe04..d7411aa5147f 100644
--- a/incubator/azuremonitor-containers/values.yaml
+++ b/incubator/azuremonitor-containers/values.yaml
@@ -6,9 +6,9 @@
 ## ref: https://github.com/Microsoft/OMS-docker/tree/ci_feature_prod
 omsagent:
   image:
-    tag: "ciprod01072020"
+    tag: "ciprod03022020"
     pullPolicy: IfNotPresent
-    dockerProviderVersion: "8.0.0-2"
+    dockerProviderVersion: "8.0.0-3"
     agentVersion: "1.10.0.1"
   ## To get your workspace id and key do the following
   ## You can create a Azure Loganalytics workspace from portal.azure.com and get its ID & PRIMARY KEY from 'Advanced Settings' tab in the Ux.
@@ -42,16 +42,32 @@ omsagent:
   ## Pod scheduling preferences.
   ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
   ##
-  affinity:
-    nodeAffinity:
-      requiredDuringSchedulingIgnoredDuringExecution:
-        nodeSelectorTerms:
-          - labelSelector:
-            matchExpressions:
-              - key: type
-                operator: NotIn
-                values:
-                  - virtual-kubelet
+  daemonset:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+            - labelSelector:
+              matchExpressions:
+                - key: type
+                  operator: NotIn
+                  values:
+                    - virtual-kubelet
+  deployment:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+            - labelSelector:
+              matchExpressions:
+                - key: type
+                  operator: NotIn
+                  values:
+                    - virtual-kubelet
+                - key: kubernetes.io/role
+                  operator: NotIn
+                  values:
+                    - master
 
   ## Configure resource requests and limits
   ## ref: http://kubernetes.io/docs/user-guide/compute-resources/