diff --git a/.changes/0.23.0.md b/.changes/0.23.0.md
new file mode 100644
index 00000000..f46ed701
--- /dev/null
+++ b/.changes/0.23.0.md
@@ -0,0 +1,15 @@
+## 0.23.0 (May 06, 2024)
+
+BREAKING CHANGES:
+
+* tfprotov5+tfprotov6: `FunctionServer` interface is now required in `ProviderServer`. Implementations not needing function support can return errors from the `GetFunctions` and `CallFunction` methods. ([#388](https://github.com/hashicorp/terraform-plugin-go/issues/388))
+* tfprotov5+tfprotov6: `MoveResourceState` method is now required in `ResourceServer`. Implementations not needing move state support can return errors from the `MoveResourceState` method. ([#388](https://github.com/hashicorp/terraform-plugin-go/issues/388))
+
+NOTES:
+
+* all: To prevent compilation errors, ensure your Go module is updated to at least terraform-plugin-framework@v1.6.0, terraform-plugin-mux@v0.15.0, terraform-plugin-sdk/v2@v2.33.0, and terraform-plugin-testing@v1.7.0 before upgrading this dependency. ([#388](https://github.com/hashicorp/terraform-plugin-go/issues/388))
+
+FEATURES:
+
+* tfprotov5+tfprotov6: Upgraded protocols and added types to support deferred actions ([#403](https://github.com/hashicorp/terraform-plugin-go/issues/403))
+
diff --git a/.changes/unreleased/BREAKING CHANGES-20240311-093208.yaml b/.changes/unreleased/BREAKING CHANGES-20240311-093208.yaml
deleted file mode 100644
index b1bc1c71..00000000
--- a/.changes/unreleased/BREAKING CHANGES-20240311-093208.yaml	
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: BREAKING CHANGES
-body: 'tfprotov5+tfprotov6: `FunctionServer` interface is now required in `ProviderServer`.
-  Implementations not needing function support can return errors from the `GetFunctions`
-  and `CallFunction` methods.'
-time: 2024-03-11T09:32:08.806864-04:00
-custom:
-  Issue: "388"
diff --git a/.changes/unreleased/BREAKING CHANGES-20240311-093436.yaml b/.changes/unreleased/BREAKING CHANGES-20240311-093436.yaml
deleted file mode 100644
index 843a107d..00000000
--- a/.changes/unreleased/BREAKING CHANGES-20240311-093436.yaml	
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: BREAKING CHANGES
-body: 'tfprotov5+tfprotov6: `MoveResourceState` method is now required in
-  `ResourceServer`. Implementations not needing move state support can return
-  errors from the `MoveResourceState` method.'
-time: 2024-03-11T09:34:36.800884-04:00
-custom:
-  Issue: "388"
diff --git a/.changes/unreleased/FEATURES-20240501-174028.yaml b/.changes/unreleased/FEATURES-20240501-174028.yaml
deleted file mode 100644
index ed98a56e..00000000
--- a/.changes/unreleased/FEATURES-20240501-174028.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: FEATURES
-body: 'tfprotov5+tfprotov6: Upgraded protocols and added types to support deferred
-  actions'
-time: 2024-05-01T17:40:28.845566-04:00
-custom:
-  Issue: "403"
diff --git a/.changes/unreleased/NOTES-20240311-093736.yaml b/.changes/unreleased/NOTES-20240311-093736.yaml
deleted file mode 100644
index 7eccf67b..00000000
--- a/.changes/unreleased/NOTES-20240311-093736.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-kind: NOTES
-body: 'all: To prevent compilation errors, ensure your Go module is updated to at
-  least terraform-plugin-framework@v1.6.0, terraform-plugin-mux@v0.15.0,
-  terraform-plugin-sdk/v2@v2.33.0, and terraform-plugin-testing@v1.7.0 before
-  upgrading this dependency.'
-time: 2024-03-11T09:37:36.503168-04:00
-custom:
-  Issue: "388"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8c40817..fafbf8d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 0.23.0 (May 06, 2024)
+
+BREAKING CHANGES:
+
+* tfprotov5+tfprotov6: `FunctionServer` interface is now required in `ProviderServer`. Implementations not needing function support can return errors from the `GetFunctions` and `CallFunction` methods. ([#388](https://github.com/hashicorp/terraform-plugin-go/issues/388))
+* tfprotov5+tfprotov6: `MoveResourceState` method is now required in `ResourceServer`. Implementations not needing move state support can return errors from the `MoveResourceState` method. ([#388](https://github.com/hashicorp/terraform-plugin-go/issues/388))
+
+NOTES:
+
+* all: To prevent compilation errors, ensure your Go module is updated to at least terraform-plugin-framework@v1.6.0, terraform-plugin-mux@v0.15.0, terraform-plugin-sdk/v2@v2.33.0, and terraform-plugin-testing@v1.7.0 before upgrading this dependency. ([#388](https://github.com/hashicorp/terraform-plugin-go/issues/388))
+
+FEATURES:
+
+* tfprotov5+tfprotov6: Upgraded protocols and added types to support deferred actions ([#403](https://github.com/hashicorp/terraform-plugin-go/issues/403))
+
 ## 0.22.2 (April 18, 2024)
 
 BUG FIXES: