diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 52e33473f9..cc590be616 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -8,6 +8,29 @@ information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeo
 additional questions or comments.
 
 ## Release History
+### 07/28/2026 -
+##### Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.6.0 (linux)
+##### Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.6.0 (windows)
+- Linux
+  - [azurelinux 3.0.20260712](https://github.com/microsoft/azurelinux/releases/tag/3.0.20260712-3.0)
+  - Golang - 1.26.5
+  - Ruby - arm64 - 3.3.5-7, x86_64 - 3.3.10
+  - MDSD - 1.42.0
+  - Telegraf - 1.39.1
+  - Fluent-bit - 5.0.4
+  - Fluentd - 1.19.3
+- Windows
+  - Golang - 1.26.5
+  - Ruby - 3.1.1
+  - Windows AMA - 47.7.1
+  - Telegraf - 1.24.2
+  - Fluent-bit - 5.0.3
+  - Fluentd - 1.16.3
+##### Code change log
+## What's Changed
+- Common (Linux + Windows)
+    * OTLP GRPC support by @suyadav1 in https://github.com/microsoft/Docker-Provider/pull/1711
+
 ### 07/21/2026 -
 ##### Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.5.0 (linux)
 ##### Version mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.5.0 (windows)
diff --git a/charts/azuremonitor-containerinsights/Chart.yaml b/charts/azuremonitor-containerinsights/Chart.yaml
index d5f33fb047..d986046ad4 100644
--- a/charts/azuremonitor-containerinsights/Chart.yaml
+++ b/charts/azuremonitor-containerinsights/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: azuremonitor-containers
 description: Azure Monitor container monitoring agent Helm chart for Kubernetes (supports both AKS addon and Arc K8s extension)
-version: 3.5.0
+version: 3.6.0
 appVersion: 7.0.0-1
 kubeVersion: "^1.10.0-0"
 keywords:
diff --git a/charts/azuremonitor-containerinsights/templates/ama-logs-daemonset.yaml b/charts/azuremonitor-containerinsights/templates/ama-logs-daemonset.yaml
index d5b169cf5c..10ec4479e1 100644
--- a/charts/azuremonitor-containerinsights/templates/ama-logs-daemonset.yaml
+++ b/charts/azuremonitor-containerinsights/templates/ama-logs-daemonset.yaml
@@ -105,7 +105,7 @@ spec:
         checksum/config: {{ toYaml $.Values.amalogs.resources | sha256sum }}
         checksum/logsettings: {{ toYaml $.Values.amalogs.logsettings | sha256sum }}
 {{- else }}
-        agentVersion: "azure-mdsd-1.40.3"
+        agentVersion: "azure-mdsd-1.42.0"
         dockerProviderVersion: "18.0.1-0"
         schema-versions: "v1"
         WSID: {{ $.Values.OmsAgent.workspaceID | b64enc | quote }}
diff --git a/charts/azuremonitor-containerinsights/templates/ama-logs-deployment-multitenancy.yaml b/charts/azuremonitor-containerinsights/templates/ama-logs-deployment-multitenancy.yaml
index fb502e578c..ac008b4c34 100644
--- a/charts/azuremonitor-containerinsights/templates/ama-logs-deployment-multitenancy.yaml
+++ b/charts/azuremonitor-containerinsights/templates/ama-logs-deployment-multitenancy.yaml
@@ -46,7 +46,7 @@ spec:
         rsName: "ama-logs-multitenancy"
         kubernetes.azure.com/managedby: aks
       annotations:
-        agentVersion: "azure-mdsd-1.40.3"
+        agentVersion: "azure-mdsd-1.42.0"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
         dockerProviderVersion: "18.0.1-0"
         schema-versions: "v1"
diff --git a/charts/azuremonitor-containerinsights/templates/ama-logs-deployment.yaml b/charts/azuremonitor-containerinsights/templates/ama-logs-deployment.yaml
index 919521ec7d..d9198ea7d1 100644
--- a/charts/azuremonitor-containerinsights/templates/ama-logs-deployment.yaml
+++ b/charts/azuremonitor-containerinsights/templates/ama-logs-deployment.yaml
@@ -70,7 +70,7 @@ spec:
         checksum/config: {{ toYaml .Values.amalogs.resources | sha256sum }}
         checksum/logsettings: {{ toYaml .Values.amalogs.logsettings | sha256sum }}
 {{- else }}
-        agentVersion: "azure-mdsd-1.40.3"
+        agentVersion: "azure-mdsd-1.42.0"
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
         dockerProviderVersion: "18.0.1-0"
         schema-versions: "v1"
diff --git a/charts/azuremonitor-containerinsights/values.yaml b/charts/azuremonitor-containerinsights/values.yaml
index 81227746e8..ee84bf11c0 100644
--- a/charts/azuremonitor-containerinsights/values.yaml
+++ b/charts/azuremonitor-containerinsights/values.yaml
@@ -41,8 +41,8 @@ OmsAgent:
   
   # Image configuration
   imageRepository: "/azuremonitor/containerinsights/ciprod"
-  imageTagLinux: "3.5.0"
-  imageTagWindows: "win-3.5.0"
+  imageTagLinux: "3.6.0"
+  imageTagWindows: "win-3.6.0"
   isImagePullPolicyAlways: false
 
   # Resource ID and cluster information
@@ -214,11 +214,11 @@ OmsAgent:
 amalogs:
   image:
     repo: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod"
-    tag: "3.5.0"
-    tagWindows: "win-3.5.0"
+    tag: "3.6.0"
+    tagWindows: "win-3.6.0"
     pullPolicy: IfNotPresent
     dockerProviderVersion: "18.0.1-0"
-    agentVersion: "azure-mdsd-1.40.3"
+    agentVersion: "azure-mdsd-1.42.0"
     winAgentVersion: "47.7.1" # there is no base agent version for windows agent
 
   # The priority used by the ama-logs priority class for the daemonset pods
diff --git a/charts/azuremonitor-containers-geneva/values.yaml b/charts/azuremonitor-containers-geneva/values.yaml
index 7960236d44..60a1a9a11c 100644
--- a/charts/azuremonitor-containers-geneva/values.yaml
+++ b/charts/azuremonitor-containers-geneva/values.yaml
@@ -17,9 +17,9 @@ genevaLogsConfig:
 
 image:
   repository: mcr.microsoft.com/azuremonitor/containerinsights/ciprod
-  tag: "3.5.0"
+  tag: "3.6.0"
   pullPolicy: IfNotPresent
-  agentVersion: "azure-mdsd-1.40.3"
+  agentVersion: "azure-mdsd-1.42.0"
 nameOverride: ""
 enableInternalMetrics: false
 enableKubernetesMetadata: false
diff --git a/charts/azuremonitor-containers/Chart.yaml b/charts/azuremonitor-containers/Chart.yaml
index 0e1c2c5b3d..b25ffe05c7 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: 3.5.0
+version: 3.6.0
 kubeVersion: "^1.10.0-0"
 keywords:
   - monitoring
diff --git a/charts/azuremonitor-containers/values.yaml b/charts/azuremonitor-containers/values.yaml
index 2b784f7279..f6fdd6c12e 100644
--- a/charts/azuremonitor-containers/values.yaml
+++ b/charts/azuremonitor-containers/values.yaml
@@ -24,11 +24,11 @@ Azure:
 amalogs:
   image:
     repo: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod"
-    tag: "3.5.0"
-    tagWindows: "win-3.5.0"
+    tag: "3.6.0"
+    tagWindows: "win-3.6.0"
     pullPolicy: IfNotPresent
     dockerProviderVersion: "18.0.1-0"
-    agentVersion: "azure-mdsd-1.40.3"
+    agentVersion: "azure-mdsd-1.42.0"
     winAgentVersion: "47.7.1" # there is no base agent version for windows agent
 
   # The priority used by the ama-logs priority class for the daemonset pods
diff --git a/kubernetes/ama-logs.yaml b/kubernetes/ama-logs.yaml
index 1c60c9bbd6..bf3b97e83a 100644
--- a/kubernetes/ama-logs.yaml
+++ b/kubernetes/ama-logs.yaml
@@ -343,7 +343,7 @@ spec:
         component: ama-logs-agent
         tier: node
       annotations:
-        agentVersion: "azure-mdsd-1.40.3"
+        agentVersion: "azure-mdsd-1.42.0"
         dockerProviderVersion: "18.0.1-0"
         schema-versions: "v1"
         kubernetes.azure.com/no-http-proxy-vars: "true"
@@ -391,7 +391,7 @@ spec:
         #         - NET_ADMIN
         #         - NET_RAW
         - name: ama-logs
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.5.0"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.6.0"
           imagePullPolicy: IfNotPresent
           resources:
             limits:
@@ -536,7 +536,7 @@ spec:
             timeoutSeconds: 15
         #Only in sidecar scraping mode
         - name: ama-logs-prometheus
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.5.0"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.6.0"
           imagePullPolicy: IfNotPresent
           resources:
             limits:
@@ -798,7 +798,7 @@ spec:
 #       labels:
 #         rsName: "ama-logs-multitenancy"
 #       annotations:
-#         agentVersion: "azure-mdsd-1.40.3"
+#         agentVersion: "azure-mdsd-1.42.0"
 #         dockerProviderVersion: "18.0.1-0"
 #         schema-versions: "v1"
 #         kubernetes.azure.com/no-http-proxy-vars: "true"
@@ -841,7 +841,7 @@ spec:
 #                 - NET_ADMIN
 #                 - NET_RAW
 #         - name: ama-logs
-#           image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.5.0"
+#           image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.6.0"
 #           imagePullPolicy: IfNotPresent
 #           resources:
 #             limits:
@@ -977,7 +977,7 @@ spec:
       labels:
         rsName: "ama-logs-rs"
       annotations:
-        agentVersion: "azure-mdsd-1.40.3"
+        agentVersion: "azure-mdsd-1.42.0"
         dockerProviderVersion: "18.0.1-0"
         schema-versions: "v1"
         kubernetes.azure.com/no-http-proxy-vars: "true"
@@ -1057,7 +1057,7 @@ spec:
         #         - NET_ADMIN
         #         - NET_RAW
         - name: ama-logs
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.5.0"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:3.6.0"
           imagePullPolicy: IfNotPresent
           # comment resources if VPA configured since the VPA will set these values
           resources:
@@ -1314,7 +1314,7 @@ spec:
         #       add:
         #         - NET_ADMIN
         - name: ama-logs-windows
-          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.5.0"
+          image: "mcr.microsoft.com/azuremonitor/containerinsights/ciprod:win-3.6.0"
           imagePullPolicy: IfNotPresent
           resources:
             requests:
diff --git a/kubernetes/linux/Dockerfile.multiarch b/kubernetes/linux/Dockerfile.multiarch
index 758b9bd1ae..f9137e9b55 100644
--- a/kubernetes/linux/Dockerfile.multiarch
+++ b/kubernetes/linux/Dockerfile.multiarch
@@ -76,7 +76,7 @@ ENV KUBE_CLIENT_BACKOFF_DURATION 0
 ENV RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR 1.0
 
 # default value will be overwritten by pipeline
-ARG IMAGE_TAG=3.5.0
+ARG IMAGE_TAG=3.6.0
 ENV AGENT_VERSION ${IMAGE_TAG}
 
 WORKDIR ${tmpdir}
diff --git a/kubernetes/windows/Dockerfile b/kubernetes/windows/Dockerfile
index f54e2b19a1..7466fac683 100644
--- a/kubernetes/windows/Dockerfile
+++ b/kubernetes/windows/Dockerfile
@@ -104,7 +104,7 @@ COPY ./amalogswindows/installer/scripts/rubyKeepCertificateAlive/*.rb /etc/fluen
 COPY ./amalogswindows/ruby/ /etc/fluent/plugin/
 
 # default value will be overwritten by pipeline
-ARG IMAGE_TAG=win-3.5.0
+ARG IMAGE_TAG=win-3.6.0
 ENV AGENT_VERSION ${IMAGE_TAG}
 
 ENV OS_TYPE "windows"