diff --git a/CHANGELOG.md b/CHANGELOG.md
index 937317b62d2793..cf9e0e16f64644 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,22 +17,34 @@ Release channels have their own copy of this changelog:
 
 
 ## 2.2.0
-* Breaking:
-  * Blockstore Index column format change
-    * The Blockstore Index column format has been updated. The column format written in v2.2 is compatible with v2.1, but incompatible with v2.0 and older.
-  * Snapshot format change
-    * The snapshot format has been modified to implement SIMD-215. Since only adjacent versions are guaranteed to maintain snapshot compatibility, this means snapshots created with v2.2 are compatible with v2.1 and incompatible with v2.0 and older.
-* Changes
-  * CLI:
-    * Add global `--skip-preflight` option for skipping preflight checks on all transactions sent through RPC. This flag, along with `--use-rpc`, can improve success rate with program deployments using the public RPC nodes.
-    * Add new command `solana feature revoke` for revoking pending feature activations. When a feature is activated, `solana feature revoke <feature-keypair> <cluster>` can be used to deallocate and reassign the account to the System program, undoing the operation. This can only be done before the feature becomes active.
-    * Add new variant to `--block-production-method` for `central-scheduler-greedy`. This is a simplified scheduler that has much better performance than the more strict `central-scheduler` variant.
-  * Unhide `--accounts-db-access-storages-method` for agave-validator and agave-ledger-tool and change default to `file`
-  * Remove tracer stats from banking-trace. `banking-trace` directory should be cleared when restarting on v2.2 for first time. It will not break if not cleared, but the file will be a mix of new/old format. (#4043)
-  * Add `--snapshot-zstd-compression-level` to set the compression level when archiving snapshots with zstd.
-  * Deprecate `--tower-storage` and all `--etcd-*` arguments
-  * SDK:
-    * `cargo-build-sbf`: add `--skip-tools-install` flag to avoid downloading platform tools and `--no-rustup-override` flag to not use rustup when invoking `cargo`. Useful for immutable environments like Nix.
+
+### CLI
+
+#### Changes
+* Add global `--skip-preflight` option for skipping preflight checks on all transactions sent through RPC. This flag, along with `--use-rpc`, can improve success rate with program deployments using the public RPC nodes.
+* Add new command `solana feature revoke` for revoking pending feature activations. When a feature is activated, `solana feature revoke <feature-keypair> <cluster>` can be used to deallocate and reassign the account to the System program, undoing the operation. This can only be done before the feature becomes active.
+
+### Validator
+
+#### Breaking
+* Blockstore Index column format change
+  * The Blockstore Index column format has been updated. The column format written in v2.2 is compatible with v2.1, but incompatible with v2.0 and older.
+* Snapshot format change
+  * The snapshot format has been modified to implement SIMD-215. Since only adjacent versions are guaranteed to maintain snapshot compatibility, this means snapshots created with v2.2 are compatible with v2.1 and incompatible with v2.0 and older.
+
+#### Changes
+* Add new variant to `--block-production-method` for `central-scheduler-greedy`. This is a simplified scheduler that has much better performance than the more strict `central-scheduler` variant.
+* Unhide `--accounts-db-access-storages-method` for agave-validator and agave-ledger-tool and change default to `file`
+* Remove tracer stats from banking-trace. `banking-trace` directory should be cleared when restarting on v2.2 for first time. It will not break if not cleared, but the file will be a mix of new/old format. (#4043)
+* Add `--snapshot-zstd-compression-level` to set the compression level when archiving snapshots with zstd.
+
+#### Deprecations
+* Deprecate `--tower-storage` and all `--etcd-*` arguments
+
+### SDK
+
+#### Changes
+* `cargo-build-sbf`: add `--skip-tools-install` flag to avoid downloading platform tools and `--no-rustup-override` flag to not use rustup when invoking `cargo`. Useful for immutable environments like Nix.
 
 ## 2.1.0
 * Breaking: