diff --git a/packages/core/src/awsService/apigateway/commands/copyUrl.ts b/packages/core/src/awsService/apigateway/commands/copyUrl.ts
index 583c0ead91d..7c19ffa9254 100644
--- a/packages/core/src/awsService/apigateway/commands/copyUrl.ts
+++ b/packages/core/src/awsService/apigateway/commands/copyUrl.ts
@@ -11,7 +11,7 @@ import * as picker from '../../../shared/ui/picker'
 import * as vscode from 'vscode'
 import { ProgressLocation } from 'vscode'
 
-import { Stage } from 'aws-sdk/clients/apigateway'
+import { Stage } from '@aws-sdk/client-api-gateway'
 import { ApiGatewayClient } from '../../../shared/clients/apiGateway'
 import { defaultDnsSuffix, RegionProvider } from '../../../shared/regions/regionProvider'
 import { getLogger } from '../../../shared/logger/logger'
diff --git a/packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts b/packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts
index 30a359d80ad..c23b6cb972f 100644
--- a/packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts
+++ b/packages/core/src/awsService/apigateway/explorer/apiGatewayNodes.ts
@@ -12,7 +12,7 @@ import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
 import { PlaceholderNode } from '../../../shared/treeview/nodes/placeholderNode'
 import { compareTreeItems, makeChildrenNodes } from '../../../shared/treeview/utils'
 import { ApiGatewayClient } from '../../../shared/clients/apiGateway'
-import { RestApi } from 'aws-sdk/clients/apigateway'
+import { RestApi } from '@aws-sdk/client-api-gateway'
 import { toArrayAsync, toMap, updateInPlace } from '../../../shared/utilities/collectionUtils'
 import { RestApiNode } from './apiNodes'
 
diff --git a/packages/core/src/awsService/apigateway/explorer/apiNodes.ts b/packages/core/src/awsService/apigateway/explorer/apiNodes.ts
index 5e20de603f0..02280a74368 100644
--- a/packages/core/src/awsService/apigateway/explorer/apiNodes.ts
+++ b/packages/core/src/awsService/apigateway/explorer/apiNodes.ts
@@ -5,7 +5,7 @@
 
 import { AWSResourceNode } from '../../../shared/treeview/nodes/awsResourceNode'
 import { AWSTreeNodeBase } from '../../../shared/treeview/nodes/awsTreeNodeBase'
-import { RestApi } from 'aws-sdk/clients/apigateway'
+import { RestApi } from '@aws-sdk/client-api-gateway'
 
 export class RestApiNode extends AWSTreeNodeBase implements AWSResourceNode {
     public override id!: string
diff --git a/packages/core/src/awsService/apigateway/vue/invokeRemoteRestApi.ts b/packages/core/src/awsService/apigateway/vue/invokeRemoteRestApi.ts
index df4f441d5c0..4e8389c89bc 100644
--- a/packages/core/src/awsService/apigateway/vue/invokeRemoteRestApi.ts
+++ b/packages/core/src/awsService/apigateway/vue/invokeRemoteRestApi.ts
@@ -8,7 +8,7 @@ import { RestApiNode } from '../explorer/apiNodes'
 import { getLogger, Logger } from '../../../shared/logger/logger'
 
 import { toArrayAsync } from '../../../shared/utilities/collectionUtils'
-import { Resource } from 'aws-sdk/clients/apigateway'
+import { Resource } from '@aws-sdk/client-api-gateway'
 import { localize } from '../../../shared/utilities/vsCodeUtils'
 import { Result } from '../../../shared/telemetry/telemetry'
 import { VueWebview } from '../../../webviews/main'
diff --git a/packages/core/src/awsService/appBuilder/explorer/nodes/deployedNode.ts b/packages/core/src/awsService/appBuilder/explorer/nodes/deployedNode.ts
index 100c6802c52..24fa77939f3 100644
--- a/packages/core/src/awsService/appBuilder/explorer/nodes/deployedNode.ts
+++ b/packages/core/src/awsService/appBuilder/explorer/nodes/deployedNode.ts
@@ -13,7 +13,8 @@ import { getLogger } from '../../../../shared/logger/logger'
 import { DefaultLambdaClient } from '../../../../shared/clients/lambdaClient'
 import globals from '../../../../shared/extensionGlobals'
 import { defaultPartition } from '../../../../shared/regions/regionProvider'
-import { Lambda, APIGateway } from 'aws-sdk'
+import { Lambda } from 'aws-sdk'
+import { RestApi } from '@aws-sdk/client-api-gateway'
 import { LambdaNode } from '../../../../lambda/explorer/lambdaNodes'
 import { LambdaFunctionNode } from '../../../../lambda/explorer/lambdaFunctionNode'
 import { S3Client, toBucket } from '../../../../shared/clients/s3'
@@ -118,12 +119,7 @@ export async function generateDeployedNode(
                 const apiParentNode = new ApiGatewayNode(partitionId, regionCode)
                 const apiNodes = await apiParentNode.getChildren()
                 const apiNode = apiNodes.find((node) => node.id === deployedResource.PhysicalResourceId)
-                newDeployedResource = new RestApiNode(
-                    apiParentNode,
-                    partitionId,
-                    regionCode,
-                    apiNode as APIGateway.RestApi
-                )
+                newDeployedResource = new RestApiNode(apiParentNode, partitionId, regionCode, apiNode as RestApi)
                 break
             }
             default:
diff --git a/packages/core/src/codewhispererChat/view/connector/connector.ts b/packages/core/src/codewhispererChat/view/connector/connector.ts
index b9c1e067b1e..6632819688a 100644
--- a/packages/core/src/codewhispererChat/view/connector/connector.ts
+++ b/packages/core/src/codewhispererChat/view/connector/connector.ts
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Timestamp } from 'aws-sdk/clients/apigateway'
 import { MessagePublisher } from '../../../amazonq/messages/messagePublisher'
 import { EditorContextCommandType } from '../../commands/registerCommands'
 import { AuthFollowUpType } from '../../../amazonq/auth/model'
@@ -97,7 +96,7 @@ interface StackOverflowMetadata {
     readonly answerCount: number
     readonly isAccepted: boolean
     readonly score: number
-    readonly lastActivityDate: Timestamp
+    readonly lastActivityDate: Date
 }
 
 export class SearchView extends UiMessage {
diff --git a/packages/core/src/test/awsService/apigateway/commands/invokeRemoteRestApi.test.ts b/packages/core/src/test/awsService/apigateway/commands/invokeRemoteRestApi.test.ts
index c50b3cf7555..26c145dbb8f 100644
--- a/packages/core/src/test/awsService/apigateway/commands/invokeRemoteRestApi.test.ts
+++ b/packages/core/src/test/awsService/apigateway/commands/invokeRemoteRestApi.test.ts
@@ -5,7 +5,7 @@
 
 import assert from 'assert'
 import { listValidMethods } from '../../../../awsService/apigateway/vue/invokeRemoteRestApi'
-import { Resource } from 'aws-sdk/clients/apigateway'
+import { Resource } from '@aws-sdk/client-api-gateway'
 
 describe('listValidMethods', function () {
     const allMethods = ['DELETE', 'GET', 'HEAD', 'OPTIONS', 'PATCH', 'POST', 'PUT']