diff --git a/CHANGELOG.md b/CHANGELOG.md
index b67cbb516..57c66d7f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+v2.6.0 / 2024-07-03
+========================
+* feat(analytics): add heartbeat pinger ([#548](https://github.com/openebs/zfs-localpv/pull/548),[@niladrih](https://github.com/niladrih))
+* fix: wrap k8s api error in GetNodeID ([#535](https://github.com/openebs/zfs-localpv/pull/535),[@aep](https://github.com/aep))
+
+v2.5.0 / 2024-03-22
+========================
+* feat(deploy/helm): move volumesnapshot CRDs to the template dir ([#488](https://github.com/openebs/zfs-localpv/pull/488),[@hrudaya21](https://github.com/hrudaya21))
+* fix(plugin): Fix ability to have custom value for openebs.io/nodeid ([#451](https://github.com/openebs/zfs-localpv/pull/451),[@jnels124](https://github.com/jnels124))
+* fix(helm): Add extra args to zfsController containers and leader election inteligence ([#492](https://github.com/openebs/zfs-localpv/pull/492),[@trunet](https://github.com/trunet))
+* chore(design): adding pv migration proposal ([#336](https://github.com/openebs/zfs-localpv/pull/336),[@pawanpraka1](https://github.com/pawanpraka1))
+* fix(charts): correct default chart values ([#506](https://github.com/openebs/zfs-localpv/pull/506),[@jnels124](https://github.com/jnels124))
+* chore: update protobuf deps ([#514](https://github.com/openebs/zfs-localpv/pull/514),[@niladrih](https://github.com/niladrih))
+* chore: change zfs-controller to a deployment from statefulset ([#513](https://github.com/openebs/zfs-localpv/pull/513),[@Abhinandan-Purkait](https://github.com/Abhinandan-Purkait))
+
 v2.4.0 / 2023-12-12
 ========================
 * fix(localpv): restore size to return as part of snapshot create response ([#480](https://github.com/openebs/zfs-localpv/pull/480),[@hrudaya21](https://github.com/hrudaya21))
diff --git a/changelogs/released/v2.5.0/451-nodeid-fix.md b/changelogs/released/v2.5.0/451-nodeid-fix.md
new file mode 100644
index 000000000..7ad4f2147
--- /dev/null
+++ b/changelogs/released/v2.5.0/451-nodeid-fix.md
@@ -0,0 +1 @@
+Fixes existing logic that attempts to retrieve a node using the name and instead retrieves the node using the nodeid label
\ No newline at end of file
diff --git a/changelogs/unreleased/492-trunet.md b/changelogs/released/v2.5.0/492-trunet.md
similarity index 100%
rename from changelogs/unreleased/492-trunet.md
rename to changelogs/released/v2.5.0/492-trunet.md
diff --git a/changelogs/released/v2.6.0/535-aep b/changelogs/released/v2.6.0/535-aep
new file mode 100644
index 000000000..fb97817d8
--- /dev/null
+++ b/changelogs/released/v2.6.0/535-aep
@@ -0,0 +1 @@
+When zfs-localpv is broken due to an k8s api issue, it just says 'GetNodeID failed for node'. This change adds the actual api error.
\ No newline at end of file
diff --git a/changelogs/released/v2.6.0/547-niladrih b/changelogs/released/v2.6.0/547-niladrih
new file mode 100644
index 000000000..65c52d1b1
--- /dev/null
+++ b/changelogs/released/v2.6.0/547-niladrih
@@ -0,0 +1 @@
+Analytics changes for the heartbeat pinger.
\ No newline at end of file
diff --git a/changelogs/unreleased/450-nodeid-fix.md b/changelogs/unreleased/450-nodeid-fix.md
deleted file mode 100644
index eeef98d0d..000000000
--- a/changelogs/unreleased/450-nodeid-fix.md
+++ /dev/null
@@ -1 +0,0 @@
-fix regression introduced with v2.0.0 that caused the plugin code to not be able to start when a user sets openebs.io/nodeid
\ No newline at end of file
diff --git a/changelogs/unreleased/505-default-chart-values.md b/changelogs/unreleased/505-default-chart-values.md
deleted file mode 100644
index 88960fed1..000000000
--- a/changelogs/unreleased/505-default-chart-values.md
+++ /dev/null
@@ -1 +0,0 @@
-correct the default values for initContainers and additionalVolumes
\ No newline at end of file