diff --git a/incubator/azuremonitor-containers/Chart.yaml b/incubator/azuremonitor-containers/Chart.yaml
index cafdd2f72a..8376f146c7 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.2.0
+version: 2.3.0
 kubeVersion: "^1.10.0-0"
 keywords:
   - monitoring
diff --git a/incubator/azuremonitor-containers/README.md b/incubator/azuremonitor-containers/README.md
index 34fd526cca..cbeb44fd3f 100644
--- a/incubator/azuremonitor-containers/README.md
+++ b/incubator/azuremonitor-containers/README.md
@@ -10,7 +10,7 @@ This article describes how to set up and use [Azure Monitor - Containers](https:
 
 ## Pre-requisites
 
-- Kubernetes 1.10+
+- [Kubernetes versions and support policy  same as AKS supported versions](https://docs.microsoft.com/en-us/azure/aks/supported-kubernetes-versions)
 
 - You will need to create a location to store your monitoring data.
 
diff --git a/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml b/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml
index c1664448e4..aff3d2b648 100644
--- a/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml
+++ b/incubator/azuremonitor-containers/templates/omsagent-daemonset.yaml
@@ -1,5 +1,5 @@
 {{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (ne .Values.omsagent.env.clusterName "<your_cluster_name>")}}
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
  name: omsagent
@@ -9,9 +9,6 @@ metadata:
    release: {{ .Release.Name }}
    heritage: {{ .Release.Service }}
 spec:
- selector:
-  matchLabels:
-   release: {{ .Release.Name }}
  updateStrategy:
   type: RollingUpdate
  template:
diff --git a/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml b/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml
index 0e93506642..377050b242 100644
--- a/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml
+++ b/incubator/azuremonitor-containers/templates/omsagent-deployment.yaml
@@ -1,5 +1,5 @@
 {{- if and (ne .Values.omsagent.secret.key "<your_workspace_key>") (ne .Values.omsagent.secret.wsid "<your_workspace_id>") (ne .Values.omsagent.env.clusterName "<your_cluster_name>")}}
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
  name: omsagent-rs
diff --git a/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml b/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml
index 557b4cfb1c..ab2911902c 100644
--- a/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml
+++ b/incubator/azuremonitor-containers/templates/omsagent-rbac.yaml
@@ -10,7 +10,7 @@ metadata:
     heritage: {{ .Release.Service }}
 ---
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: omsagent-reader
   labels:
@@ -31,7 +31,7 @@ rules:
   verbs: ["get"]
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
+apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: omsagentclusterrolebinding
   labels:
@@ -46,5 +46,5 @@ roleRef:
   kind: ClusterRole
   name: omsagent-reader
   apiGroup: rbac.authorization.k8s.io
-{{- end }} 
+{{- end }}
 
diff --git a/incubator/azuremonitor-containers/templates/omsagent-rs-configmap.yaml b/incubator/azuremonitor-containers/templates/omsagent-rs-configmap.yaml
index f1f7d004d7..3eeb55112b 100644
--- a/incubator/azuremonitor-containers/templates/omsagent-rs-configmap.yaml
+++ b/incubator/azuremonitor-containers/templates/omsagent-rs-configmap.yaml
@@ -7,7 +7,7 @@ data:
     #fluent forward plugin
      <source>
       type forward
-      port 25227
+      port "#{ENV['HEALTHMODEL_REPLICASET_SERVICE_SERVICE_PORT']}"
       bind 0.0.0.0
      </source>
 
@@ -240,16 +240,19 @@ data:
       retry_mdm_post_wait_minutes 60
      </match>
 
-     <match oms.api.KubeHealth.AgentCollectionTime**>
-      type out_oms_api
+     <match kubehealth.Signals**>
+      type out_oms
       log_level debug
-      buffer_chunk_limit 10m
+      num_threads 5
+      buffer_chunk_limit 20m
       buffer_type file
-      buffer_path %STATE_DIR_WS%/out_oms_api_kubehealth*.buffer
-      buffer_queue_limit 10
+      buffer_path %STATE_DIR_WS%/out_oms_kubehealth*.buffer
+      buffer_queue_limit 20
+      buffer_queue_full_action drop_oldest_chunk
       flush_interval 20s
       retry_limit 10
       retry_wait 30s
+      max_retry_wait 9m
      </match>
 metadata:
   name: omsagent-rs-config
diff --git a/incubator/azuremonitor-containers/values.yaml b/incubator/azuremonitor-containers/values.yaml
index 3667de66ce..f92785d768 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: "ciprod09262019"
+    tag: "ciprod10182019"
     pullPolicy: IfNotPresent
-    dockerProviderVersion: "7.0.0-3"
+    dockerProviderVersion: "7.0.0-5"
     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.