diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 72e1cf5b24..a507dfd1b4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -41,6 +41,16 @@ Fixed
 
   Contributed by Amanda McGuinness (@amanda11 intive) #5581
 
+* Fixed regression caused by #5358. Use string lock name instead of object ID. #5484
+
+  Contributed by @khushboobhatia01
+
+* Fix ``st2-self-check`` script reporting falsey success when the nested workflows runs failed. #5487
+
+* Use byte type lock name which is supported by all tooz drivers. #5529
+
+  Contributed by @khushboobhatia01
+
 Added
 ~~~~~
 
@@ -106,18 +116,10 @@ Added
 
   Contributed by @Rand01ph
 
-Fixed
-~~~~~
-
-* Fixed regression caused by #5358. Use string lock name instead of object ID. #5484
-
-  Contributed by @khushboobhatia01
+* Moved @nmaludy from Senior Maintainers to Friends.
 
-* Fix ``st2-self-check`` script reporting falsey success when the nested workflows runs failed. #5487
+  Contributed by @nmaludy
 
-* Use byte type lock name which is supported by all tooz drivers. #5529
-
-  Contributed by @khushboobhatia01
 
 3.6.0 - October 29, 2021
 ------------------------
diff --git a/OWNERS.md b/OWNERS.md
index 887af43983..02ec507652 100644
--- a/OWNERS.md
+++ b/OWNERS.md
@@ -21,8 +21,6 @@ Have deep platform knowledge & experience and demonstrate technical leadership a
   - Ansible, Core, deb/rpm packages, CI/CD, Deployments, Release Engineering, Infrastructure, Documentation.
 * Eugen Cusmaunsa ([@armab](https://github.com/armab)) <<armab@stackstorm.com>>
   - Systems, Deployments, Docker, K8s, HA, Ansible, Chef, Vagrant, deb/rpm, CI/CD, Infrastructure, Release Engineering, Community.
-* Nick Maludy ([@nmaludy](https://github.com/nmaludy)) <<nmaludy@gmail.com>>
-  - Community, Core, Systems, Infrastructure, StackStorm Exchange, Puppet deployment. [Case Study](https://stackstorm.com/case-study-encore/).
 * Tomaz Muraus ([@kami](https://github.com/kami)) <<tomaz@stackstorm.com>>
   - Core, Performance, API, Scalability, CI/CD, Systems, Deployments, Packaging, OpenSource.
 * Winson Chan ([@m4dcoder](https://github.com/m4dcoder)) <<wcchan@stackstorm.com>>
@@ -86,5 +84,7 @@ Thank you, Friends!
 * Lakshmi Kannan ([@lakshmi-kannan](https://github.com/lakshmi-kannan)) - early Stormer. Initial Core platform architecture, scalability, reliability, Team Leadership during the project hard times.
 * Lindsay Hill ([@LindsayHill](https://github.com/LindsayHill)) - ex StackStorm product manager that made a significant impact building an ecosystem we see today.
 * Manas Kelshikar ([@manasdk](https://github.com/manasdk)) - ex Stormer. Developed (well) early core platform features.
+* Nick Maludy ([@nmaludy](https://github.com/nmaludy)) <<nmaludy@gmail.com>>
+  - Community, Core, Systems, Infrastructure, StackStorm Exchange, Puppet deployment. [Case Study](https://stackstorm.com/case-study-encore/).
 * Vineesh Jain ([@VineeshJain](https://github.com/VineeshJain)) - ex Stormer. Community, Tests, Core, QA.
 * Warren Van Winckel ([@warrenvw](https://github.com/warrenvw)) - ex Stormer. Docker, Kubernetes, Vagrant, Infrastructure.