diff --git a/packages/api-graphql/src/internals/index.ts b/packages/api-graphql/src/internals/index.ts
index b642219670..0982a4f8e3 100644
--- a/packages/api-graphql/src/internals/index.ts
+++ b/packages/api-graphql/src/internals/index.ts
@@ -7,3 +7,4 @@ export {
 
 export { graphql, cancel, isCancelError } from './v6';
 export { generateClient } from './generateClient';
+export { CommonPublicClientOptions } from './types';
diff --git a/packages/api-graphql/src/types/index.ts b/packages/api-graphql/src/types/index.ts
index a2df909128..1de31c99f3 100644
--- a/packages/api-graphql/src/types/index.ts
+++ b/packages/api-graphql/src/types/index.ts
@@ -26,7 +26,7 @@ export { CONTROL_MSG, ConnectionState } from './PubSub';
 
 export { SelectionSet } from '@aws-amplify/data-schema/runtime';
 
-export { CommonPublicClientOptions };
+export type { CommonPublicClientOptions };
 
 /**
  * Loose/Unknown options for raw GraphQLAPICategory `graphql()`.
diff --git a/packages/api/package.json b/packages/api/package.json
index 173406972b..60d39083b8 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api",
-	"version": "6.1.3",
+	"version": "6.1.8",
 	"description": "Api category of aws-amplify",
 	"main": "./dist/cjs/index.js",
 	"module": "./dist/esm/index.mjs",
@@ -80,8 +80,8 @@
 		"server"
 	],
 	"dependencies": {
-		"@aws-amplify/api-graphql": "4.6.1",
-		"@aws-amplify/api-rest": "4.0.58",
+		"@aws-amplify/api-graphql": "4.6.6",
+		"@aws-amplify/api-rest": "4.0.63",
 		"tslib": "^2.5.0"
 	}
 }
diff --git a/packages/api/src/API.ts b/packages/api/src/API.ts
index e8a13aadd4..c77718dbd1 100644
--- a/packages/api/src/API.ts
+++ b/packages/api/src/API.ts
@@ -1,7 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { CommonPublicClientOptions, V6Client } from '@aws-amplify/api-graphql';
-import { generateClient as internalGenerateClient } from '@aws-amplify/api-graphql/internals';
+import { V6Client } from '@aws-amplify/api-graphql';
+import {
+	CommonPublicClientOptions,
+	generateClient as internalGenerateClient,
+} from '@aws-amplify/api-graphql/internals';
 import { Amplify } from '@aws-amplify/core';
 
 // NOTE: The type narrowing on CommonPublicClientOptions seems to hinge on