diff --git a/ansible_collections/arista/cvp/CHANGELOG.rst b/ansible_collections/arista/cvp/CHANGELOG.rst
index 32ba5ea14..07392787b 100644
--- a/ansible_collections/arista/cvp/CHANGELOG.rst
+++ b/ansible_collections/arista/cvp/CHANGELOG.rst
@@ -5,6 +5,24 @@ Arista.Cvp Release Notes
 .. contents:: Topics
 
 
+v3.6.1
+======
+
+Release Summary
+---------------
+
+Release 3.6.1 - See documentation on cvp.avd.sh for details.
+
+
+Bugfixes
+--------
+
+- Fix(cv_container_v3) check_mode error(#584)
+- Fix(cv_device_v3) Device decommission failure scenario(#577)
+- Fix(cv_device_v3) Fix check for missing devices(#593)
+- Fix(cv_device_v3) Implement device check mode(#571)
+- Fix(cv_tag_v3) Allow tag assignment to serial numbers(#581)
+
 v3.6.0
 ======
 
diff --git a/ansible_collections/arista/cvp/changelogs/.plugin-cache.yaml b/ansible_collections/arista/cvp/changelogs/.plugin-cache.yaml
index bf67ce306..1829a1a78 100644
--- a/ansible_collections/arista/cvp/changelogs/.plugin-cache.yaml
+++ b/ansible_collections/arista/cvp/changelogs/.plugin-cache.yaml
@@ -6,6 +6,7 @@ plugins:
   callback: {}
   cliconf: {}
   connection: {}
+  filter: {}
   httpapi: {}
   inventory: {}
   lookup: {}
@@ -78,5 +79,6 @@ plugins:
   netconf: {}
   shell: {}
   strategy: {}
+  test: {}
   vars: {}
-version: 3.6.0
+version: 3.6.1
diff --git a/ansible_collections/arista/cvp/changelogs/changelog.yaml b/ansible_collections/arista/cvp/changelogs/changelog.yaml
index e1b8ce84e..8f8cc5bcd 100644
--- a/ansible_collections/arista/cvp/changelogs/changelog.yaml
+++ b/ansible_collections/arista/cvp/changelogs/changelog.yaml
@@ -72,3 +72,17 @@ releases:
     fragments:
     - v3.6.0.yml
     release_date: '2023-01-12'
+  3.6.1:
+    changes:
+      bugfixes:
+      - Fix(cv_container_v3) check_mode error(#584)
+      - Fix(cv_device_v3) Device decommission failure scenario(#577)
+      - Fix(cv_device_v3) Fix check for missing devices(#593)
+      - Fix(cv_device_v3) Implement device check mode(#571)
+      - Fix(cv_tag_v3) Allow tag assignment to serial numbers(#581)
+      release_summary: 'Release 3.6.1 - See documentation on cvp.avd.sh for details.
+
+        '
+    fragments:
+    - v3.6.1.yml
+    release_date: '2023-03-28'
diff --git a/ansible_collections/arista/cvp/changelogs/fragments_backup/v3.6.1.yml b/ansible_collections/arista/cvp/changelogs/fragments_backup/v3.6.1.yml
new file mode 100644
index 000000000..fc1287227
--- /dev/null
+++ b/ansible_collections/arista/cvp/changelogs/fragments_backup/v3.6.1.yml
@@ -0,0 +1,9 @@
+release_summary: |
+  Release 3.6.1 - See documentation on cvp.avd.sh for details.
+
+bugfixes:
+- Fix(cv_container_v3) check_mode error(#584)
+- Fix(cv_device_v3) Implement device check mode(#571)
+- Fix(cv_device_v3) Device decommission failure scenario(#577)
+- Fix(cv_device_v3) Fix check for missing devices(#593)
+- Fix(cv_tag_v3) Allow tag assignment to serial numbers(#581)
diff --git a/ansible_collections/arista/cvp/docs/release-notes/v3.x.md b/ansible_collections/arista/cvp/docs/release-notes/v3.x.md
index e0ccbf2ae..c23094e61 100644
--- a/ansible_collections/arista/cvp/docs/release-notes/v3.x.md
+++ b/ansible_collections/arista/cvp/docs/release-notes/v3.x.md
@@ -8,6 +8,18 @@
 - On premise version higher than 2018.2.5
 - CloudVision as a Service
 
+## Release 3.6.1
+
+Full release note available on [github](https://github.com/aristanetworks/ansible-cvp/releases/tag/v3.6.1)
+
+### Bug fixes
+
+- `cv_container_v3` check_mode error (#584)
+- `cv_device_v3` Implement device check mode (#571)
+- `cv_device_v3` Device decommission failure scenario (#577)
+- `cv_device_v3` Fix check for missing devices (#593)
+- `cv_tag_v3` Allow tag assignment to serial numbers (#581)
+
 ## Release 3.6.0
 
 Full release note available on [github](https://github.com/aristanetworks/ansible-cvp/releases/tag/v3.6.0)
diff --git a/ansible_collections/arista/cvp/galaxy.yml b/ansible_collections/arista/cvp/galaxy.yml
index 827b17e34..904b128a8 100644
--- a/ansible_collections/arista/cvp/galaxy.yml
+++ b/ansible_collections/arista/cvp/galaxy.yml
@@ -7,7 +7,7 @@ namespace: arista
 name: cvp
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 3.6.0
+version: 3.6.1
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md