diff --git a/README.md b/README.md
index d3ddc28c0..389d35e15 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ environments.
 
 | Ceph CSI Version | Container Orchestrator Name | Version Tested|
 | -----------------| --------------------------- | --------------|
+| v3.6.0 | Kubernetes | v1.21, v1.22, v1.23|
 | v3.5.1 | Kubernetes | v1.21, v1.22, v1.23|
 | v3.5.0 | Kubernetes | v1.21, v1.22, v1.23|
 | v3.4.0 | Kubernetes | v1.20, v1.21, v1.22|
@@ -66,8 +67,8 @@ NOTE:
 The supported window of Ceph CSI versions  is known as "N.(x-1)":
 (N (Latest major release) . (x (Latest minor release) - 1)).
 
-For example, if Ceph CSI latest major version is `3.5.0` today, support is
-provided for the versions above `3.4.0`. If users are running an unsupported
+For example, if Ceph CSI latest major version is `3.6.0` today, support is
+provided for the versions above `3.5.0`. If users are running an unsupported
 Ceph CSI version, they will be asked to upgrade when requesting support for the
 cluster.
 
@@ -124,6 +125,7 @@ in the Kubernetes documentation.
 | Ceph CSI Release/Branch | Container image name         | Image Tag |
 | ----------------------- | ---------------------------- | --------- |
 | devel (Branch)          | quay.io/cephcsi/cephcsi      | canary    |
+| v3.6.0 (Release)        | quay.io/cephcsi/cephcsi      | v3.6.0    |
 | v3.5.1 (Release)        | quay.io/cephcsi/cephcsi      | v3.5.1    |
 | v3.5.0 (Release)        | quay.io/cephcsi/cephcsi      | v3.5.0    |
 | v3.4.0 (Release)        | quay.io/cephcsi/cephcsi      | v3.4.0    |
diff --git a/docs/ceph-csi-upgrade.md b/docs/ceph-csi-upgrade.md
index ff4319287..b12fd3a4a 100644
--- a/docs/ceph-csi-upgrade.md
+++ b/docs/ceph-csi-upgrade.md
@@ -7,6 +7,7 @@
   - [Upgrading from v3.2 to v3.3](#upgrading-from-v32-to-v33)
   - [Upgrading from v3.3 to v3.4](#upgrading-from-v33-to-v34)
   - [Upgrading from v3.4 to v3.5](#upgrading-from-v34-to-v35)
+  - [Upgrading from v3.5 to v3.6](#upgrading-from-v35-to-v36)
     - [Upgrading CephFS](#upgrading-cephfs)
       - [1. Upgrade CephFS Provisioner resources](#1-upgrade-cephfs-provisioner-resources)
         - [1.1 Update the CephFS Provisioner RBAC](#11-update-the-cephfs-provisioner-rbac)
@@ -73,6 +74,11 @@ to upgrade from cephcsi v3.3 to v3.4
 
 ## Upgrading from v3.4 to v3.5
 
+Refer [upgrade-from-v3.4-v3.5](https://github.com/ceph/ceph-csi/blob/v3.5.1/docs/ceph-csi-upgrade.md)
+to upgrade from cephcsi v3.4 to v3.5
+
+## Upgrading from v3.5 to v3.6
+
 **Ceph-csi releases from devel are expressly unsupported.** It is strongly
 recommended that you use [official
 releases](https://github.com/ceph/ceph-csi/releases) of Ceph-csi. Unreleased
@@ -81,15 +87,15 @@ that will not be supported in the official releases. Builds from the devel
 branch can have functionality changed and even removed at any time without
 compatibility support and without prior notice.
 
-**Also, we do not recommend any direct upgrades to 3.5 except from 3.4 to 3.5.**
-For example, upgrading from 3.3 to 3.5 is not recommended.
+**Also, we do not recommend any direct upgrades to 3.6 except from 3.5 to 3.6.**
+For example, upgrading from 3.4 to 3.6 is not recommended.
 
-git checkout v3.5.1 tag
+git checkout v3.6.0 tag
 
 ```bash
 git clone https://github.com/ceph/ceph-csi.git
 cd ./ceph-csi
-git checkout v3.5.1
+git checkout v3.6.0
 ```
 
 ```console
@@ -214,7 +220,7 @@ For each node:
   - The pod deletion causes the pods to be restarted and updated automatically
     on the node.
 
-we have successfully upgraded cephfs csi from v3.4 to v3.5
+we have successfully upgraded cephfs csi from v3.5 to v3.6
 
 ### Upgrading RBD
 
@@ -280,7 +286,7 @@ daemonset.apps/csi-rbdplugin configured
 service/csi-metrics-rbdplugin configured
 ```
 
-we have successfully upgraded RBD csi from v3.4 to v3.5
+we have successfully upgraded RBD csi from v3.5 to v3.6
 
 ### CSI Sidecar containers consideration