diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d040850..83f16598 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.20.1](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.20.0...v2.20.1) (2024-03-28)
+
+### Bug Fixes
+
+- add optional chaining ([#1156](https://github.com/aws-amplify/amplify-codegen-ui/issues/1156)) ([70799cb](https://github.com/aws-amplify/amplify-codegen-ui/commit/70799cb0e8fcc6a873bdf1e673683c18d860525d))
+- fix code scanning alerts ([#1155](https://github.com/aws-amplify/amplify-codegen-ui/issues/1155)) ([575cbcc](https://github.com/aws-amplify/amplify-codegen-ui/commit/575cbccad19ed2c8df0aa5315898a3cc57ee6fc6))
+- use non-aliased name when importing custom components ([7d68d83](https://github.com/aws-amplify/amplify-codegen-ui/commit/7d68d83a1756606298b606b37b05d72a351da17c))
+
 # [2.20.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.19.4...v2.20.0) (2023-12-08)
 
 ### Bug Fixes
diff --git a/lerna.json b/lerna.json
index 12700e2b..54c2955f 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,7 @@
 {
   "packages": ["packages/*"],
   "exact": true,
-  "version": "2.20.0",
+  "version": "2.20.1",
   "command": {
     "version": {
       "message": "chore(release): %s"
diff --git a/packages/codegen-ui-react/CHANGELOG.md b/packages/codegen-ui-react/CHANGELOG.md
index f1b65eeb..89083dfe 100644
--- a/packages/codegen-ui-react/CHANGELOG.md
+++ b/packages/codegen-ui-react/CHANGELOG.md
@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.20.1](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.20.0...v2.20.1) (2024-03-28)
+
+### Bug Fixes
+
+- add optional chaining ([#1156](https://github.com/aws-amplify/amplify-codegen-ui/issues/1156)) ([70799cb](https://github.com/aws-amplify/amplify-codegen-ui/commit/70799cb0e8fcc6a873bdf1e673683c18d860525d))
+- use non-aliased name when importing custom components ([7d68d83](https://github.com/aws-amplify/amplify-codegen-ui/commit/7d68d83a1756606298b606b37b05d72a351da17c))
+
 # [2.20.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.19.4...v2.20.0) (2023-12-08)
 
 ### Bug Fixes
diff --git a/packages/codegen-ui-react/package-lock.json b/packages/codegen-ui-react/package-lock.json
index a223a473..9afd8b00 100644
--- a/packages/codegen-ui-react/package-lock.json
+++ b/packages/codegen-ui-react/package-lock.json
@@ -1,15 +1,15 @@
 {
   "name": "@aws-amplify/codegen-ui-react",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@aws-amplify/codegen-ui-react",
-      "version": "2.20.0",
+      "version": "2.20.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-amplify/codegen-ui": "2.20.0",
+        "@aws-amplify/codegen-ui": "2.20.1",
         "@typescript/vfs": "~1.3.5",
         "pluralize": "^8.0.0",
         "semver": "^7.5.4",
diff --git a/packages/codegen-ui-react/package.json b/packages/codegen-ui-react/package.json
index 832d0833..dd77c12e 100644
--- a/packages/codegen-ui-react/package.json
+++ b/packages/codegen-ui-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/codegen-ui-react",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "description": "Amplify UI React code generation implementation",
   "author": "Amazon Web Services",
   "repository": "https://github.com/aws-amplify/amplify-codegen-ui.git",
@@ -34,7 +34,7 @@
     "react-test-renderer": "^17.0.2"
   },
   "dependencies": {
-    "@aws-amplify/codegen-ui": "2.20.0",
+    "@aws-amplify/codegen-ui": "2.20.1",
     "@typescript/vfs": "~1.3.5",
     "pluralize": "^8.0.0",
     "semver": "^7.5.4",
diff --git a/packages/codegen-ui/CHANGELOG.md b/packages/codegen-ui/CHANGELOG.md
index c5d54c4d..6c8b22c7 100644
--- a/packages/codegen-ui/CHANGELOG.md
+++ b/packages/codegen-ui/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.20.1](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.20.0...v2.20.1) (2024-03-28)
+
+### Bug Fixes
+
+- use non-aliased name when importing custom components ([7d68d83](https://github.com/aws-amplify/amplify-codegen-ui/commit/7d68d83a1756606298b606b37b05d72a351da17c))
+
 # [2.20.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.19.4...v2.20.0) (2023-12-08)
 
 ### Bug Fixes
diff --git a/packages/codegen-ui/package-lock.json b/packages/codegen-ui/package-lock.json
index 2d2381ec..7c5a176f 100644
--- a/packages/codegen-ui/package-lock.json
+++ b/packages/codegen-ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@aws-amplify/codegen-ui",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@aws-amplify/codegen-ui",
-      "version": "2.20.0",
+      "version": "2.20.1",
       "license": "Apache-2.0",
       "dependencies": {
         "change-case": "^4.1.2",
diff --git a/packages/codegen-ui/package.json b/packages/codegen-ui/package.json
index 37a5c018..8f12d7f9 100644
--- a/packages/codegen-ui/package.json
+++ b/packages/codegen-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/codegen-ui",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "description": "generic component code generation interface definitions",
   "author": "Amazon Web Services",
   "homepage": "https://docs.amplify.aws/",
diff --git a/packages/test-generator/CHANGELOG.md b/packages/test-generator/CHANGELOG.md
index 5682144d..6c19f76a 100644
--- a/packages/test-generator/CHANGELOG.md
+++ b/packages/test-generator/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.20.1](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.20.0...v2.20.1) (2024-03-28)
+
+**Note:** Version bump only for package @aws-amplify/codegen-ui-test-generator
+
 # [2.20.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.19.4...v2.20.0) (2023-12-08)
 
 ### Features
diff --git a/packages/test-generator/package-lock.json b/packages/test-generator/package-lock.json
index 09881c4a..ecd8df34 100644
--- a/packages/test-generator/package-lock.json
+++ b/packages/test-generator/package-lock.json
@@ -1,16 +1,16 @@
 {
   "name": "@aws-amplify/codegen-ui-test-generator",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@aws-amplify/codegen-ui-test-generator",
-      "version": "2.20.0",
+      "version": "2.20.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-amplify/codegen-ui": "2.20.0",
-        "@aws-amplify/codegen-ui-react": "2.20.0",
+        "@aws-amplify/codegen-ui": "2.20.1",
+        "@aws-amplify/codegen-ui-react": "2.20.1",
         "@types/node": "^15.12.1",
         "loglevel": "^1.7.1",
         "typescript": "^4.2.4"
diff --git a/packages/test-generator/package.json b/packages/test-generator/package.json
index 6e793f25..4e86a2fa 100644
--- a/packages/test-generator/package.json
+++ b/packages/test-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/codegen-ui-test-generator",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "description": "Test generator with sample JSON files",
   "author": "Amazon Web Services",
   "repository": "https://github.com/aws-amplify/amplify-codegen-ui.git",
@@ -19,8 +19,8 @@
     "dist/**"
   ],
   "dependencies": {
-    "@aws-amplify/codegen-ui": "2.20.0",
-    "@aws-amplify/codegen-ui-react": "2.20.0",
+    "@aws-amplify/codegen-ui": "2.20.1",
+    "@aws-amplify/codegen-ui-react": "2.20.1",
     "@types/node": "^15.12.1",
     "loglevel": "^1.7.1",
     "typescript": "^4.2.4"