diff --git a/.changes/1.22.0.json b/.changes/1.22.0.json
new file mode 100644
index 00000000000..1860828cc78
--- /dev/null
+++ b/.changes/1.22.0.json
@@ -0,0 +1,14 @@
+{
+	"date": "2021-03-19",
+	"version": "1.22.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "fix unwanted \"invalid SAM CLI\" error on startup"
+		},
+		{
+			"type": "Feature",
+			"description": "StepFunctions: show \"View Logs\" button on failure"
+		}
+	]
+}
\ No newline at end of file
diff --git a/.changes/next-release/Bug Fix-d03e847a-3cf5-47af-ae31-fb5d1d9e4138.json b/.changes/next-release/Bug Fix-d03e847a-3cf5-47af-ae31-fb5d1d9e4138.json
deleted file mode 100644
index 6e2a3ad7d7a..00000000000
--- a/.changes/next-release/Bug Fix-d03e847a-3cf5-47af-ae31-fb5d1d9e4138.json	
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Bug Fix",
-	"description": "fix unwanted \"invalid SAM CLI\" error on startup"
-}
\ No newline at end of file
diff --git a/.changes/next-release/Feature-089508dc-c21a-4808-a809-140556017044.json b/.changes/next-release/Feature-089508dc-c21a-4808-a809-140556017044.json
deleted file mode 100644
index ba488a1c48e..00000000000
--- a/.changes/next-release/Feature-089508dc-c21a-4808-a809-140556017044.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"type": "Feature",
-	"description": "StepFunctions: show \"View Logs\" button on failure"
-}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20d282fe6b8..ca0b4b4b22b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.22.0 2021-03-19
+
+- **Bug Fix** fix unwanted "invalid SAM CLI" error on startup
+- **Feature** StepFunctions: show "View Logs" button on failure
+
 ## 1.21.0 2021-03-17
 
 - **Breaking Change** SAM debug: remove nodejs8.10 support
diff --git a/package-lock.json b/package-lock.json
index 682272a9cc5..d43237f95b7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "aws-toolkit-vscode",
-    "version": "1.22.0-SNAPSHOT",
+    "version": "1.22.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
diff --git a/package.json b/package.json
index 1c8c86404d8..ad5a8c07e07 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "aws-toolkit-vscode",
     "displayName": "AWS Toolkit",
     "description": "An extension for working with Amazon Web Services",
-    "version": "1.22.0-SNAPSHOT",
+    "version": "1.22.0",
     "publisher": "amazonwebservices",
     "license": "Apache-2.0",
     "repository": {