diff --git a/charts/azuremonitor-containers/Chart.yaml b/charts/azuremonitor-containers/Chart.yaml
index 4dd6623bf..38d2e30ec 100644
--- a/charts/azuremonitor-containers/Chart.yaml
+++ b/charts/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.9.0
+version: 2.9.1
 kubeVersion: "^1.10.0-0"
 keywords:
   - monitoring
diff --git a/charts/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml b/charts/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml
index 78831aa10..cc995b3c2 100644
--- a/charts/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml
+++ b/charts/azuremonitor-containers/templates/omsagent-daemonset-windows.yaml
@@ -21,7 +21,7 @@ spec:
    labels:
     dsName: "omsagent-ds"
    annotations:
-    agentVersion: {{ .Values.omsagent.image.tagWindows }}
+    agentVersion: {{ .Values.omsagent.winAgentVersion }}
     dockerProviderVersion: {{ .Values.omsagent.image.dockerProviderVersion }}
     schema-versions: "v1"
     checksum/secret: {{ include (print $.Template.BasePath "/omsagent-secret.yaml") . | sha256sum }}
@@ -53,6 +53,12 @@ spec:
        resources:
 {{ toYaml .Values.omsagent.resources.daemonsetwindows | indent 9 }}
        env:
+       - name: FBIT_SERVICE_FLUSH_INTERVAL
+         value: "15"
+       - name: FBIT_TAIL_BUFFER_CHUNK_SIZE
+         value: "1"
+       - name: FBIT_TAIL_BUFFER_MAX_SIZE
+         value: "1"
        {{- if ne .Values.omsagent.env.clusterId "<your_cluster_id>" }}
        - name: AKS_RESOURCE_ID
          value: {{ .Values.omsagent.env.clusterId | quote }}
diff --git a/charts/azuremonitor-containers/templates/omsagent-daemonset.yaml b/charts/azuremonitor-containers/templates/omsagent-daemonset.yaml
index 8e5513f91..ba3ad7c0b 100644
--- a/charts/azuremonitor-containers/templates/omsagent-daemonset.yaml
+++ b/charts/azuremonitor-containers/templates/omsagent-daemonset.yaml
@@ -21,7 +21,7 @@ spec:
    labels:
     dsName: "omsagent-ds"
    annotations:
-    agentVersion: {{ .Values.omsagent.image.tag }}
+    agentVersion: {{ .Values.omsagent.agentVersion }}
     dockerProviderVersion: {{ .Values.omsagent.image.dockerProviderVersion }}
     schema-versions: "v1"
     checksum/secret: {{ include (print $.Template.BasePath "/omsagent-secret.yaml") . | sha256sum }}
diff --git a/charts/azuremonitor-containers/templates/omsagent-deployment.yaml b/charts/azuremonitor-containers/templates/omsagent-deployment.yaml
index 1eaf7f652..26b0ccca0 100644
--- a/charts/azuremonitor-containers/templates/omsagent-deployment.yaml
+++ b/charts/azuremonitor-containers/templates/omsagent-deployment.yaml
@@ -22,7 +22,7 @@ spec:
    labels:
     rsName: "omsagent-rs"
    annotations:
-    agentVersion: {{ .Values.omsagent.image.tag }}
+    agentVersion: {{ .Values.omsagent.agentVersion }}
     dockerProviderVersion: {{ .Values.omsagent.image.dockerProviderVersion }}
     schema-versions: "v1"
     checksum/secret: {{ include (print $.Template.BasePath "/omsagent-secret.yaml") . | sha256sum }}
diff --git a/charts/azuremonitor-containers/values.yaml b/charts/azuremonitor-containers/values.yaml
index 0456eb625..aa4c6bcf2 100644
--- a/charts/azuremonitor-containers/values.yaml
+++ b/charts/azuremonitor-containers/values.yaml
@@ -25,7 +25,8 @@ omsagent:
     tagWindows: "win-ciprod01312022"
     pullPolicy: IfNotPresent
     dockerProviderVersion: "16.0.0-0"
-    agentVersion: "1.10.0.1"
+    agentVersion: "azure-mdsd-1.14.2"
+    winAgentVersion: "0.0.0-0" # there is no base agent version for windows agent
 
   # The priority used by the omsagent priority class for the daemonset pods
   # Note that this is not execution piority - it is scheduling priority, as