diff --git a/lerna.json b/lerna.json
index baf7eee41d..ae6cc65abe 100644
--- a/lerna.json
+++ b/lerna.json
@@ -4,7 +4,7 @@
     "packages/*",
     "samples/*"
   ],
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/create-sitecore-jss/package.json b/packages/create-sitecore-jss/package.json
index bea8235f8d..a1a7d005b7 100644
--- a/packages/create-sitecore-jss/package.json
+++ b/packages/create-sitecore-jss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-sitecore-jss",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "description": "Sitecore JSS initializer",
   "bin": "./dist/index.js",
   "scripts": {
diff --git a/packages/create-sitecore-jss/src/templates/angular/package.json b/packages/create-sitecore-jss/src/templates/angular/package.json
index 27c01350a8..62e7cfaced 100644
--- a/packages/create-sitecore-jss/src/templates/angular/package.json
+++ b/packages/create-sitecore-jss/src/templates/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "<%- appName %>",
-  "version": "20.4.0-canary",
+  "version": "20.4.0",
   "description": "Application utilizing Sitecore JavaScript Services and Angular (angular-cli).",
   "config": {
     "appName": "<%- appName %>",
@@ -63,8 +63,8 @@
     "@apollo/client": "^3.3.12",
     "@ngx-translate/core": "~13.0.0",
     "@ngx-translate/http-loader": "~6.0.0",
-    "@sitecore-jss/sitecore-jss": "^20.4.0-canary",
-    "@sitecore-jss/sitecore-jss-angular": "^20.4.0-canary",
+    "@sitecore-jss/sitecore-jss": "^20.4.0",
+    "@sitecore-jss/sitecore-jss-angular": "^20.4.0",
     "apollo-angular": "~2.4.0",
     "bootstrap": "^4.3.1",
     "core-js": "~3.9.1",
@@ -86,9 +86,9 @@
     "@angular/cli": "~11.2.5",
     "@angular/compiler-cli": "~11.2.6",
     "@angular/language-service": "~11.2.6",
-    "@sitecore-jss/sitecore-jss-angular-schematics": "^20.4.0-canary",
-    "@sitecore-jss/sitecore-jss-cli": "^20.4.0-canary",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^20.4.0-canary",
+    "@sitecore-jss/sitecore-jss-angular-schematics": "^20.4.0",
+    "@sitecore-jss/sitecore-jss-cli": "^20.4.0",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^20.4.0",
     "@types/isomorphic-fetch": "0.0.35",
     "@types/jasmine": "~3.6.7",
     "@types/jasminewd2": "~2.0.8",
diff --git a/packages/create-sitecore-jss/src/templates/nextjs-styleguide/package.json b/packages/create-sitecore-jss/src/templates/nextjs-styleguide/package.json
index 799b0c8564..8710cbf99d 100644
--- a/packages/create-sitecore-jss/src/templates/nextjs-styleguide/package.json
+++ b/packages/create-sitecore-jss/src/templates/nextjs-styleguide/package.json
@@ -4,7 +4,7 @@
     "nprogress": "~0.2.0"
   },
   "devDependencies": {
-    "@sitecore-jss/sitecore-jss-dev-tools": "^20.4.0-canary",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^20.4.0",
     "@types/nprogress": "^0.2.0"
   },
   "scripts": {
diff --git a/packages/create-sitecore-jss/src/templates/nextjs/package.json b/packages/create-sitecore-jss/src/templates/nextjs/package.json
index d0825d4d39..1e6ddcd643 100644
--- a/packages/create-sitecore-jss/src/templates/nextjs/package.json
+++ b/packages/create-sitecore-jss/src/templates/nextjs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "<%- appName %>",
   "description": "Application utilizing Sitecore JavaScript Services and Next.js",
-  "version": "20.4.0-canary",
+  "version": "20.4.0",
   "private": true,
   "config": {
     "appName": "<%- appName %>",
@@ -29,7 +29,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@sitecore-jss/sitecore-jss-nextjs": "^20.4.0-canary",
+    "@sitecore-jss/sitecore-jss-nextjs": "^20.4.0",
     "graphql": "~15.8.0",
     "graphql-tag": "^2.12.6",
     "next": "^13.1.6",
@@ -45,7 +45,7 @@
     "@graphql-codegen/typescript-operations": "^1.17.9",
     "@graphql-codegen/typescript-resolvers": "^1.17.10",
     "@graphql-typed-document-node/core": "^3.1.0",
-    "@sitecore-jss/sitecore-jss-cli": "^20.4.0-canary",
+    "@sitecore-jss/sitecore-jss-cli": "^20.4.0",
     "@types/node": "^14.6.4",
     "@types/nprogress": "^0.2.0",
     "@types/react": "^18.2.22",
diff --git a/packages/create-sitecore-jss/src/templates/node-headless-ssr-experience-edge/package.json b/packages/create-sitecore-jss/src/templates/node-headless-ssr-experience-edge/package.json
index 198b52222e..0aa7796c38 100644
--- a/packages/create-sitecore-jss/src/templates/node-headless-ssr-experience-edge/package.json
+++ b/packages/create-sitecore-jss/src/templates/node-headless-ssr-experience-edge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-headless-ssr-experience-edge-sample",
-  "version": "20.4.0-canary",
+  "version": "20.4.0",
   "description": "Node server-side-rendering sample for running JSS apps under Node hosting using Experience Edge",
   "main": "index.js",
   "scripts": {
@@ -24,7 +24,7 @@
   "homepage": "https://jss.sitecore.com",
   "license": "Apache-2.0",
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^20.4.0-canary",
+    "@sitecore-jss/sitecore-jss": "^20.4.0",
     "compression": "^1.7.4",
     "express": "^4.17.1"
   },
diff --git a/packages/create-sitecore-jss/src/templates/node-headless-ssr-proxy/package.json b/packages/create-sitecore-jss/src/templates/node-headless-ssr-proxy/package.json
index 4ac30d10db..fff710a523 100644
--- a/packages/create-sitecore-jss/src/templates/node-headless-ssr-proxy/package.json
+++ b/packages/create-sitecore-jss/src/templates/node-headless-ssr-proxy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-headless-ssr-proxy-sample",
-  "version": "20.4.0-canary",
+  "version": "20.4.0",
   "description": "Node server-side-rendering proxy sample for running JSS apps under Node hosting",
   "main": "dist/index.js",
   "scripts": {
@@ -24,8 +24,8 @@
   "homepage": "https://jss.sitecore.com",
   "license": "Apache-2.0",
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^20.4.0-canary",
-    "@sitecore-jss/sitecore-jss-proxy": "^20.4.0-canary",
+    "@sitecore-jss/sitecore-jss": "^20.4.0",
+    "@sitecore-jss/sitecore-jss-proxy": "^20.4.0",
     "agentkeepalive": "^4.1.3",
     "compression": "~1.7.3",
     "express": "~4.16.4",
diff --git a/packages/create-sitecore-jss/src/templates/react-native/package.json b/packages/create-sitecore-jss/src/templates/react-native/package.json
index 5424d3d614..13b4f2cbf9 100644
--- a/packages/create-sitecore-jss/src/templates/react-native/package.json
+++ b/packages/create-sitecore-jss/src/templates/react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "<%- appName %>",
-  "version": "20.4.0-canary",
+  "version": "20.4.0",
   "description": "A basic React Native app utilizing Sitecore JavaScript Services",
   "config": {
     "appName": "<%- appName %>",
@@ -27,7 +27,7 @@
   },
   "dependencies": {
     "@react-native-community/masked-view": "^0.1.10",
-    "@sitecore-jss/sitecore-jss-react-native": "^20.4.0-canary",
+    "@sitecore-jss/sitecore-jss-react-native": "^20.4.0",
     "prop-types": "^15.6.0",
     "react": "16.13.1",
     "react-native": "^0.63.4",
@@ -41,8 +41,8 @@
   },
   "private": true,
   "devDependencies": {
-    "@sitecore-jss/sitecore-jss-cli": "^20.4.0-canary",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^20.4.0-canary",
+    "@sitecore-jss/sitecore-jss-cli": "^20.4.0",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^20.4.0",
     "babel-core": "^6.26.0",
     "babel-eslint": "^8.2.1",
     "babel-plugin-inline-replace-variables": "^1.3.1",
diff --git a/packages/create-sitecore-jss/src/templates/react/package.json b/packages/create-sitecore-jss/src/templates/react/package.json
index 9523a18151..0763f222b0 100644
--- a/packages/create-sitecore-jss/src/templates/react/package.json
+++ b/packages/create-sitecore-jss/src/templates/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "<%- appName %>",
   "description": "Application utilizing Sitecore JavaScript Services and React (create-react-app).",
-  "version": "20.4.0-canary",
+  "version": "20.4.0",
   "private": true,
   "config": {
     "appName": "<%- appName %>",
@@ -32,7 +32,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@apollo/client": "^3.7.1",
-    "@sitecore-jss/sitecore-jss-react": "^20.4.0-canary",
+    "@sitecore-jss/sitecore-jss-react": "^20.4.0",
     "axios": "^1.2.0",
     "bootstrap": "^5.2.3",
     "cross-fetch": "^3.1.5",
@@ -58,9 +58,9 @@
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-react": "^7.18.6",
     "@babel/register": "~7.18.9",
-    "@sitecore-jss/sitecore-jss-cli": "^20.4.0-canary",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^20.4.0-canary",
-    "@sitecore-jss/sitecore-jss-rendering-host": "^20.4.0-canary",
+    "@sitecore-jss/sitecore-jss-cli": "^20.4.0",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^20.4.0",
+    "@sitecore-jss/sitecore-jss-rendering-host": "^20.4.0",
     "babel-eslint": "^10.1.0",
     "babel-loader": "~9.1.0",
     "babel-preset-react-app": "~10.0.1",
diff --git a/packages/create-sitecore-jss/src/templates/vue/package.json b/packages/create-sitecore-jss/src/templates/vue/package.json
index e4a5501c79..1528ac7472 100644
--- a/packages/create-sitecore-jss/src/templates/vue/package.json
+++ b/packages/create-sitecore-jss/src/templates/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "<%- appName %>",
-  "version": "20.4.0-canary",
+  "version": "20.4.0",
   "description": "Application utilizing Sitecore JavaScript Services and Vue (vue-cli).",
   "private": true,
   "config": {
@@ -48,7 +48,7 @@
   "dependencies": {
     "@apollo/client": "^3.5.6",
     "@panter/vue-i18next": "~0.15.1",
-    "@sitecore-jss/sitecore-jss-vue": "^20.4.0-canary",
+    "@sitecore-jss/sitecore-jss-vue": "^20.4.0",
     "@vue/apollo-composable": "4.0.0-beta.2",
     "@vue/apollo-option": "^4.0.0-alpha.11",
     "@vue/apollo-ssr": "^4.0.0-alpha.11",
@@ -68,8 +68,8 @@
   "devDependencies": {
     "@babel/register": "7.18.9",
     "@babel/eslint-parser": "^7.19.1",
-    "@sitecore-jss/sitecore-jss-cli": "^20.4.0-canary",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^20.4.0-canary",
+    "@sitecore-jss/sitecore-jss-cli": "^20.4.0",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^20.4.0",
     "@vue/cli-plugin-babel": "~5.0.8",
     "@vue/cli-plugin-eslint": "~5.0.8",
     "@vue/cli-service": "~5.0.8",
diff --git a/packages/sitecore-jss-angular-schematics/package.json b/packages/sitecore-jss-angular-schematics/package.json
index de0841f391..6183762a6b 100644
--- a/packages/sitecore-jss-angular-schematics/package.json
+++ b/packages/sitecore-jss-angular-schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-angular-schematics",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "description": "Scaffolding schematics for Sitecore JSS Angular apps",
   "scripts": {
     "build": "tsc -p tsconfig.json",
diff --git a/packages/sitecore-jss-angular/package.json b/packages/sitecore-jss-angular/package.json
index 1a831cf0b1..5247aac763 100644
--- a/packages/sitecore-jss-angular/package.json
+++ b/packages/sitecore-jss-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-angular",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "description": "",
   "scripts": {
     "build": "ng-packagr -p ng-package.json",
@@ -58,7 +58,7 @@
     "rxjs": "~6.6.6"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^20.4.0-canary.7"
+    "@sitecore-jss/sitecore-jss": "20.4.0"
   },
   "main": "dist/bundles/sitecore-jss-sitecore-jss-angular.umd.js",
   "module": "dist/fesm2015/sitecore-jss-sitecore-jss-angular.js",
diff --git a/packages/sitecore-jss-cli/package.json b/packages/sitecore-jss-cli/package.json
index c359844744..4c9f206c01 100644
--- a/packages/sitecore-jss-cli/package.json
+++ b/packages/sitecore-jss-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-cli",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "description": "Sitecore JSS command-line",
   "main": "dist/cjs/cli.js",
   "module": "dist/esm/cli.js",
@@ -33,7 +33,7 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss-dev-tools": "^20.4.0-canary.7",
+    "@sitecore-jss/sitecore-jss-dev-tools": "20.4.0",
     "chalk": "^2.4.2",
     "cross-spawn": "^7.0.0",
     "dotenv": "^8.2.0",
diff --git a/packages/sitecore-jss-dev-tools/package.json b/packages/sitecore-jss-dev-tools/package.json
index dcc2079247..7d699a6954 100644
--- a/packages/sitecore-jss-dev-tools/package.json
+++ b/packages/sitecore-jss-dev-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-dev-tools",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "description": "Utilities to assist in the development and deployment of Sitecore JSS apps.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -33,7 +33,7 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^20.4.0-canary.7",
+    "@sitecore-jss/sitecore-jss": "20.4.0",
     "axios": "^0.21.1",
     "chalk": "^2.4.1",
     "chokidar": "^3.2.1",
diff --git a/packages/sitecore-jss-forms/package.json b/packages/sitecore-jss-forms/package.json
index 5db2a6b0dc..2fada932dc 100644
--- a/packages/sitecore-jss-forms/package.json
+++ b/packages/sitecore-jss-forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-forms",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -44,7 +44,7 @@
     "typescript": "~4.3.5"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^20.4.0-canary.7"
+    "@sitecore-jss/sitecore-jss": "20.4.0"
   },
   "description": "",
   "types": "types/index.d.ts",
diff --git a/packages/sitecore-jss-nextjs/package.json b/packages/sitecore-jss-nextjs/package.json
index 803cb8ecc2..6874e1335b 100644
--- a/packages/sitecore-jss-nextjs/package.json
+++ b/packages/sitecore-jss-nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -69,9 +69,9 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^20.4.0-canary.7",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^20.4.0-canary.7",
-    "@sitecore-jss/sitecore-jss-react": "^20.4.0-canary.7",
+    "@sitecore-jss/sitecore-jss": "20.4.0",
+    "@sitecore-jss/sitecore-jss-dev-tools": "20.4.0",
+    "@sitecore-jss/sitecore-jss-react": "20.4.0",
     "prop-types": "^15.7.2",
     "regex-parser": "^2.2.11",
     "sync-disk-cache": "^2.1.0"
diff --git a/packages/sitecore-jss-proxy/package-lock.json b/packages/sitecore-jss-proxy/package-lock.json
index db88e74b82..682fb55f38 100644
--- a/packages/sitecore-jss-proxy/package-lock.json
+++ b/packages/sitecore-jss-proxy/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sitecore-jss/sitecore-jss-proxy",
-	"version": "20.4.0-canary.7",
+	"version": "20.4.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
diff --git a/packages/sitecore-jss-proxy/package.json b/packages/sitecore-jss-proxy/package.json
index 706344ae7f..8d04c1e968 100644
--- a/packages/sitecore-jss-proxy/package.json
+++ b/packages/sitecore-jss-proxy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-proxy",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "description": "Proxy middleware for express.js server.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
diff --git a/packages/sitecore-jss-react-forms/package.json b/packages/sitecore-jss-react-forms/package.json
index bc149e139e..b21ba9143d 100644
--- a/packages/sitecore-jss-react-forms/package.json
+++ b/packages/sitecore-jss-react-forms/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-react-forms",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -55,7 +55,7 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss-forms": "^20.4.0-canary.7",
+    "@sitecore-jss/sitecore-jss-forms": "20.4.0",
     "prop-types": "^15.7.2"
   },
   "description": "",
diff --git a/packages/sitecore-jss-react-native/package.json b/packages/sitecore-jss-react-native/package.json
index 0e4896ce1c..0264f6b305 100644
--- a/packages/sitecore-jss-react-native/package.json
+++ b/packages/sitecore-jss-react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-react-native",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -28,7 +28,7 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^20.4.0-canary.7",
+    "@sitecore-jss/sitecore-jss": "20.4.0",
     "prop-types": "^15.7.2",
     "react-native-htmlview": "^0.15.0",
     "react-native-svg": "^5.3.0",
diff --git a/packages/sitecore-jss-react/package.json b/packages/sitecore-jss-react/package.json
index b2b22987bd..7c1b2cda8d 100644
--- a/packages/sitecore-jss-react/package.json
+++ b/packages/sitecore-jss-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-react",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -60,7 +60,7 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^20.4.0-canary.7",
+    "@sitecore-jss/sitecore-jss": "20.4.0",
     "deep-equal": "^2.0.5",
     "prop-types": "^15.7.2",
     "style-attr": "^1.3.0"
diff --git a/packages/sitecore-jss-rendering-host/package.json b/packages/sitecore-jss-rendering-host/package.json
index 778a4c5e3d..aef1e43ef8 100644
--- a/packages/sitecore-jss-rendering-host/package.json
+++ b/packages/sitecore-jss-rendering-host/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-rendering-host",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
diff --git a/packages/sitecore-jss-vue/package.json b/packages/sitecore-jss-vue/package.json
index 0dc364c21b..654bbb0731 100644
--- a/packages/sitecore-jss-vue/package.json
+++ b/packages/sitecore-jss-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-vue",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "description": "A library for building Sitecore JSS apps using Vue.js",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -49,7 +49,7 @@
     "vue": "^v3.1.0-beta.6"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^20.4.0-canary.7",
+    "@sitecore-jss/sitecore-jss": "20.4.0",
     "@vue/compiler-sfc": "^3.0.11"
   },
   "types": "./types/index.d.ts",
diff --git a/packages/sitecore-jss/package.json b/packages/sitecore-jss/package.json
index b0b609e5cd..306e1f8e29 100644
--- a/packages/sitecore-jss/package.json
+++ b/packages/sitecore-jss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss",
-  "version": "20.4.0-canary.7",
+  "version": "20.4.0",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
diff --git a/yarn.lock b/yarn.lock
index 27e11224a0..b63238d414 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3865,7 +3865,7 @@ __metadata:
     "@angular/platform-browser": ~11.2.6
     "@angular/platform-browser-dynamic": ~11.2.6
     "@angular/router": ~11.2.6
-    "@sitecore-jss/sitecore-jss": ^20.4.0-canary.7
+    "@sitecore-jss/sitecore-jss": 20.4.0
     "@types/jasmine": ^3.4.1
     "@types/node": ^14.14.35
     codelyzer: ^6.0.1
@@ -3896,7 +3896,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss-cli@workspace:packages/sitecore-jss-cli"
   dependencies:
-    "@sitecore-jss/sitecore-jss-dev-tools": ^20.4.0-canary.7
+    "@sitecore-jss/sitecore-jss-dev-tools": 20.4.0
     "@types/chai": ^4.2.3
     "@types/cross-spawn": ^6.0.0
     "@types/mocha": ^5.2.7
@@ -3928,11 +3928,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-jss/sitecore-jss-dev-tools@^20.4.0-canary.7, @sitecore-jss/sitecore-jss-dev-tools@workspace:packages/sitecore-jss-dev-tools":
+"@sitecore-jss/sitecore-jss-dev-tools@20.4.0, @sitecore-jss/sitecore-jss-dev-tools@workspace:packages/sitecore-jss-dev-tools":
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss-dev-tools@workspace:packages/sitecore-jss-dev-tools"
   dependencies:
-    "@sitecore-jss/sitecore-jss": ^20.4.0-canary.7
+    "@sitecore-jss/sitecore-jss": 20.4.0
     "@types/chai": ^4.2.3
     "@types/chokidar": ^2.1.3
     "@types/del": ^4.0.0
@@ -3986,11 +3986,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-jss/sitecore-jss-forms@^20.4.0-canary.7, @sitecore-jss/sitecore-jss-forms@workspace:packages/sitecore-jss-forms":
+"@sitecore-jss/sitecore-jss-forms@20.4.0, @sitecore-jss/sitecore-jss-forms@workspace:packages/sitecore-jss-forms":
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss-forms@workspace:packages/sitecore-jss-forms"
   dependencies:
-    "@sitecore-jss/sitecore-jss": ^20.4.0-canary.7
+    "@sitecore-jss/sitecore-jss": 20.4.0
     "@types/chai": ^4.1.6
     "@types/chai-string": ^1.4.1
     "@types/lodash.unescape": ^4.0.4
@@ -4013,9 +4013,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss-nextjs@workspace:packages/sitecore-jss-nextjs"
   dependencies:
-    "@sitecore-jss/sitecore-jss": ^20.4.0-canary.7
-    "@sitecore-jss/sitecore-jss-dev-tools": ^20.4.0-canary.7
-    "@sitecore-jss/sitecore-jss-react": ^20.4.0-canary.7
+    "@sitecore-jss/sitecore-jss": 20.4.0
+    "@sitecore-jss/sitecore-jss-dev-tools": 20.4.0
+    "@sitecore-jss/sitecore-jss-react": 20.4.0
     "@types/chai": ^4.2.2
     "@types/chai-as-promised": ^7.1.3
     "@types/chai-string": ^1.4.2
@@ -4085,7 +4085,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss-react-forms@workspace:packages/sitecore-jss-react-forms"
   dependencies:
-    "@sitecore-jss/sitecore-jss-forms": ^20.4.0-canary.7
+    "@sitecore-jss/sitecore-jss-forms": 20.4.0
     "@types/chai": ^4.3.4
     "@types/enzyme": ^3.10.12
     "@types/mocha": ^10.0.1
@@ -4125,7 +4125,7 @@ __metadata:
     "@babel/plugin-proposal-export-default-from": ^7.5.2
     "@babel/preset-env": ^7.6.2
     "@babel/preset-typescript": ^7.6.0
-    "@sitecore-jss/sitecore-jss": ^20.4.0-canary.7
+    "@sitecore-jss/sitecore-jss": 20.4.0
     "@types/jest": ^24.0.18
     "@types/prop-types": ^15.7.3
     "@types/react": ^16.9.5
@@ -4155,11 +4155,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-jss/sitecore-jss-react@^20.4.0-canary.7, @sitecore-jss/sitecore-jss-react@workspace:packages/sitecore-jss-react":
+"@sitecore-jss/sitecore-jss-react@20.4.0, @sitecore-jss/sitecore-jss-react@workspace:packages/sitecore-jss-react":
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss-react@workspace:packages/sitecore-jss-react"
   dependencies:
-    "@sitecore-jss/sitecore-jss": ^20.4.0-canary.7
+    "@sitecore-jss/sitecore-jss": 20.4.0
     "@types/chai": ^4.2.2
     "@types/chai-string": ^1.4.2
     "@types/deep-equal": ^1.0.1
@@ -4231,7 +4231,7 @@ __metadata:
   resolution: "@sitecore-jss/sitecore-jss-vue@workspace:packages/sitecore-jss-vue"
   dependencies:
     "@babel/core": ^7.16.0
-    "@sitecore-jss/sitecore-jss": ^20.4.0-canary.7
+    "@sitecore-jss/sitecore-jss": 20.4.0
     "@types/jest": ^26.0.23
     "@vue/compiler-dom": ^3.2.21
     "@vue/compiler-sfc": ^3.0.11
@@ -4253,7 +4253,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sitecore-jss/sitecore-jss@^20.4.0-canary.7, @sitecore-jss/sitecore-jss@workspace:packages/sitecore-jss":
+"@sitecore-jss/sitecore-jss@20.4.0, @sitecore-jss/sitecore-jss@workspace:packages/sitecore-jss":
   version: 0.0.0-use.local
   resolution: "@sitecore-jss/sitecore-jss@workspace:packages/sitecore-jss"
   dependencies: