diff --git a/.changes/0.22.0.md b/.changes/0.22.0.md
new file mode 100644
index 000000000..4c2a560b5
--- /dev/null
+++ b/.changes/0.22.0.md
@@ -0,0 +1,11 @@
+## 0.22.0 (February 22, 2024)
+
+BREAKING CHANGES:
+
+* tfprotov5+tfprotov6: Modified the response returned from the CallFunction RPC, replacing diagnostics with function error ([#380](https://github.com/hashicorp/terraform-plugin-go/issues/380))
+
+NOTES:
+
+* all: This Go module has been updated to Go 1.21 per the [Go support policy](https://go.dev/doc/devel/release#policy). It is recommended to review the [Go 1.21 release notes](https://go.dev/doc/go1.21) before upgrading. Any consumers building on earlier Go versions may experience errors. ([#381](https://github.com/hashicorp/terraform-plugin-go/issues/381))
+* all: If using terraform-plugin-framework, terraform-plugin-mux, or terraform-plugin-sdk, only upgrade this Go module when upgrading those Go modules to terraform-plugin-framework@v1.6.0, terraform-plugin-mux@v0.15.0, and terraform-plugin-sdk/v2@v2.33.0, or greater, respectively ([#380](https://github.com/hashicorp/terraform-plugin-go/issues/380))
+
diff --git a/.changes/unreleased/BREAKING CHANGES-20240221-103010.yaml b/.changes/unreleased/BREAKING CHANGES-20240221-103010.yaml
deleted file mode 100644
index ad91dbf63..000000000
--- a/.changes/unreleased/BREAKING CHANGES-20240221-103010.yaml	
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: BREAKING CHANGES
-body: 'tfprotov5+tfprotov6: Modified the response returned from the CallFunction RPC,
-  replacing diagnostics with function error'
-time: 2024-02-21T10:30:10.223878Z
-custom:
-  Issue: "380"
diff --git a/.changes/unreleased/NOTES-20240221-121520.yaml b/.changes/unreleased/NOTES-20240221-121520.yaml
deleted file mode 100644
index 4f890b9bf..000000000
--- a/.changes/unreleased/NOTES-20240221-121520.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-kind: NOTES
-body: 'all: This Go module has been updated to Go 1.21 per the [Go support policy](https://go.dev/doc/devel/release#policy). It is recommended to review the [Go 1.21 release notes](https://go.dev/doc/go1.21) before upgrading. Any consumers building on earlier Go versions may experience errors.'
-time: 2024-02-21T12:15:20.864273-05:00
-custom:
-  Issue: "381"
diff --git a/.changes/unreleased/NOTES-20240222-080818.yaml b/.changes/unreleased/NOTES-20240222-080818.yaml
deleted file mode 100644
index d22ee726b..000000000
--- a/.changes/unreleased/NOTES-20240222-080818.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: NOTES
-body: 'all: If using terraform-plugin-framework, terraform-plugin-mux, or terraform-plugin-sdk,
-  only upgrade this Go module when upgrading those Go modules to terraform-plugin-framework@v1.6.0, 
-  terraform-plugin-mux@v0.15.0, and terraform-plugin-sdk/v2@v2.33.0, or greater, respectively'
-time: 2024-02-22T08:08:18.434191Z
-custom:
-  Issue: "380"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3050f923..e92692d8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 0.22.0 (February 22, 2024)
+
+BREAKING CHANGES:
+
+* tfprotov5+tfprotov6: Modified the response returned from the CallFunction RPC, replacing diagnostics with function error ([#380](https://github.com/hashicorp/terraform-plugin-go/issues/380))
+
+NOTES:
+
+* all: This Go module has been updated to Go 1.21 per the [Go support policy](https://go.dev/doc/devel/release#policy). It is recommended to review the [Go 1.21 release notes](https://go.dev/doc/go1.21) before upgrading. Any consumers building on earlier Go versions may experience errors. ([#381](https://github.com/hashicorp/terraform-plugin-go/issues/381))
+* all: If using terraform-plugin-framework, terraform-plugin-mux, or terraform-plugin-sdk, only upgrade this Go module when upgrading those Go modules to terraform-plugin-framework@v1.6.0, terraform-plugin-mux@v0.15.0, and terraform-plugin-sdk/v2@v2.33.0, or greater, respectively ([#380](https://github.com/hashicorp/terraform-plugin-go/issues/380))
+
 ## 0.21.0 (January 26, 2024)
 
 NOTES: