diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3e47065..0a544140 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.17.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.16.0...v2.17.0) (2023-10-03)
+
+### Bug Fixes
+
+- added more amplify js v6 unit tests fixed a bug ([#1102](https://github.com/aws-amplify/amplify-codegen-ui/issues/1102)) ([6cce085](https://github.com/aws-amplify/amplify-codegen-ui/commit/6cce085eb45c2b67980a7cbc04aec9be7fd292a2))
+
+### Features
+
+- support amplify js v6 api changes ([#1101](https://github.com/aws-amplify/amplify-codegen-ui/issues/1101)) ([acae93c](https://github.com/aws-amplify/amplify-codegen-ui/commit/acae93c8b8ea0d2a9bdfe764dcc4ab2821edfffe))
+
 # [2.16.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.15.9...v2.16.0) (2023-09-28)
 
 ### Bug Fixes
diff --git a/lerna.json b/lerna.json
index c9cd0bfe..8892b7d9 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,7 +1,7 @@
 {
   "packages": ["packages/*"],
   "exact": true,
-  "version": "2.16.0",
+  "version": "2.17.0",
   "command": {
     "version": {
       "message": "chore(release): %s"
diff --git a/packages/codegen-ui-golden-files/CHANGELOG.md b/packages/codegen-ui-golden-files/CHANGELOG.md
index 77d43d83..684c9eb1 100644
--- a/packages/codegen-ui-golden-files/CHANGELOG.md
+++ b/packages/codegen-ui-golden-files/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.17.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.16.0...v2.17.0) (2023-10-03)
+
+**Note:** Version bump only for package @aws-amplify/codegen-ui-golden-files
+
 # [2.16.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.15.9...v2.16.0) (2023-09-28)
 
 **Note:** Version bump only for package @aws-amplify/codegen-ui-golden-files
diff --git a/packages/codegen-ui-golden-files/package-lock.json b/packages/codegen-ui-golden-files/package-lock.json
index c11791a3..ba0afd31 100644
--- a/packages/codegen-ui-golden-files/package-lock.json
+++ b/packages/codegen-ui-golden-files/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@aws-amplify/codegen-ui-golden-files",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@aws-amplify/codegen-ui-golden-files",
-      "version": "2.16.0",
+      "version": "2.17.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-amplify/datastore": "^3.12.12",
diff --git a/packages/codegen-ui-golden-files/package.json b/packages/codegen-ui-golden-files/package.json
index 3efe897b..696c1fb6 100644
--- a/packages/codegen-ui-golden-files/package.json
+++ b/packages/codegen-ui-golden-files/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/codegen-ui-golden-files",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "description": "Models of outputs to customer project",
   "author": "Amazon Web Services",
   "homepage": "https://docs.amplify.aws/",
@@ -11,7 +11,7 @@
     "typescript": "^4.8.4"
   },
   "dependencies": {
-    "@aws-amplify/codegen-ui": "2.16.0",
+    "@aws-amplify/codegen-ui": "2.17.0",
     "@aws-amplify/datastore": "^3.12.12",
     "@aws-amplify/ui-react": "^3.5.7",
     "aws-amplify": "^4.3.37",
diff --git a/packages/codegen-ui-react/CHANGELOG.md b/packages/codegen-ui-react/CHANGELOG.md
index 4213c56e..63b40342 100644
--- a/packages/codegen-ui-react/CHANGELOG.md
+++ b/packages/codegen-ui-react/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.17.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.16.0...v2.17.0) (2023-10-03)
+
+### Bug Fixes
+
+- added more amplify js v6 unit tests fixed a bug ([#1102](https://github.com/aws-amplify/amplify-codegen-ui/issues/1102)) ([6cce085](https://github.com/aws-amplify/amplify-codegen-ui/commit/6cce085eb45c2b67980a7cbc04aec9be7fd292a2))
+
+### Features
+
+- support amplify js v6 api changes ([#1101](https://github.com/aws-amplify/amplify-codegen-ui/issues/1101)) ([acae93c](https://github.com/aws-amplify/amplify-codegen-ui/commit/acae93c8b8ea0d2a9bdfe764dcc4ab2821edfffe))
+
 # [2.16.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.15.9...v2.16.0) (2023-09-28)
 
 ### Bug Fixes
diff --git a/packages/codegen-ui-react/package-lock.json b/packages/codegen-ui-react/package-lock.json
index b9ac5f21..90876f6e 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.16.0",
+  "version": "2.17.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@aws-amplify/codegen-ui-react",
-      "version": "2.16.0",
+      "version": "2.17.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-amplify/codegen-ui": "2.16.0",
+        "@aws-amplify/codegen-ui": "2.17.0",
         "@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 d915d416..b0ddae68 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.16.0",
+  "version": "2.17.0",
   "description": "Amplify UI React code generation implementation",
   "author": "Amazon Web Services",
   "repository": "https://github.com/aws-amplify/amplify-codegen-ui.git",
@@ -31,7 +31,7 @@
     "pascalcase": "1.0.0"
   },
   "dependencies": {
-    "@aws-amplify/codegen-ui": "2.16.0",
+    "@aws-amplify/codegen-ui": "2.17.0",
     "@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 14b0bebd..09fdf174 100644
--- a/packages/codegen-ui/CHANGELOG.md
+++ b/packages/codegen-ui/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.17.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.16.0...v2.17.0) (2023-10-03)
+
+**Note:** Version bump only for package @aws-amplify/codegen-ui
+
 # [2.16.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.15.9...v2.16.0) (2023-09-28)
 
 ### Features
diff --git a/packages/codegen-ui/package-lock.json b/packages/codegen-ui/package-lock.json
index 187d021b..7d334cf5 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.16.0",
+  "version": "2.17.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@aws-amplify/codegen-ui",
-      "version": "2.16.0",
+      "version": "2.17.0",
       "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 11e1bdb2..6ebb233f 100644
--- a/packages/codegen-ui/package.json
+++ b/packages/codegen-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/codegen-ui",
-  "version": "2.16.0",
+  "version": "2.17.0",
   "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 373b0a92..bd025493 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.17.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.16.0...v2.17.0) (2023-10-03)
+
+**Note:** Version bump only for package @aws-amplify/codegen-ui-test-generator
+
 # [2.16.0](https://github.com/aws-amplify/amplify-codegen-ui/compare/v2.15.9...v2.16.0) (2023-09-28)
 
 ### Bug Fixes
diff --git a/packages/test-generator/package-lock.json b/packages/test-generator/package-lock.json
index 71f53ce9..ae617efd 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.16.0",
+  "version": "2.17.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@aws-amplify/codegen-ui-test-generator",
-      "version": "2.16.0",
+      "version": "2.17.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-amplify/codegen-ui": "2.16.0",
-        "@aws-amplify/codegen-ui-react": "2.16.0",
+        "@aws-amplify/codegen-ui": "2.17.0",
+        "@aws-amplify/codegen-ui-react": "2.17.0",
         "@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 fb35ea09..560aa993 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.16.0",
+  "version": "2.17.0",
   "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.16.0",
-    "@aws-amplify/codegen-ui-react": "2.16.0",
+    "@aws-amplify/codegen-ui": "2.17.0",
+    "@aws-amplify/codegen-ui-react": "2.17.0",
     "@types/node": "^15.12.1",
     "loglevel": "^1.7.1",
     "typescript": "^4.2.4"