diff --git a/aws/env.ts b/aws/env.ts
index 6da6279..14eb206 100644
--- a/aws/env.ts
+++ b/aws/env.ts
@@ -1,4 +1,5 @@
-import { GetCallerIdentityCommand, STSClient } from '@aws-sdk/client-sts'
+import type { STSClient } from '@aws-sdk/client-sts'
+import { GetCallerIdentityCommand } from '@aws-sdk/client-sts'
 import type { Environment } from 'aws-cdk-lib'
 
 export const env = async ({
diff --git a/cdk/BackendStack.ts b/cdk/BackendStack.ts
index 8fd06aa..fc12e40 100644
--- a/cdk/BackendStack.ts
+++ b/cdk/BackendStack.ts
@@ -1,6 +1,7 @@
 import { LambdaSource } from '@bifravst/aws-cdk-lambda-helpers/cdk'
 import type { PackedLayer } from '@bifravst/aws-cdk-lambda-helpers/layer'
-import { App, aws_lambda as Lambda, Stack, type Environment } from 'aws-cdk-lib'
+import type { App } from 'aws-cdk-lib'
+import { aws_lambda as Lambda, Stack, type Environment } from 'aws-cdk-lib'
 import type { BackendLambdas } from './packBackendLambdas.js'
 import { ConvertDeviceMessages } from './resources/ConvertDeviceMessages.js'
 import { STACK_NAME } from './stackConfig.js'
diff --git a/cdk/layers/baseLayer.ts b/cdk/layers/baseLayer.ts
index 0c7135b..a9815d8 100644
--- a/cdk/layers/baseLayer.ts
+++ b/cdk/layers/baseLayer.ts
@@ -2,7 +2,7 @@ import {
 	packLayer,
 	type PackedLayer,
 } from '@bifravst/aws-cdk-lambda-helpers/layer'
-import pJson from '../../package.json'
+import type pJson from '../../package.json'
 
 const dependencies: Array<keyof (typeof pJson)['dependencies']> = [
 	'@aws-lambda-powertools/metrics',
diff --git a/cdk/resources/ConvertDeviceMessages.ts b/cdk/resources/ConvertDeviceMessages.ts
index 20cbe44..acea23b 100644
--- a/cdk/resources/ConvertDeviceMessages.ts
+++ b/cdk/resources/ConvertDeviceMessages.ts
@@ -2,12 +2,8 @@ import {
 	IoTActionRole,
 	PackedLambdaFn,
 } from '@bifravst/aws-cdk-lambda-helpers/cdk'
-import {
-	aws_iam as IAM,
-	aws_iot as IoT,
-	aws_lambda as Lambda,
-	Stack,
-} from 'aws-cdk-lib'
+import type { aws_lambda as Lambda } from 'aws-cdk-lib'
+import { aws_iam as IAM, aws_iot as IoT, Stack } from 'aws-cdk-lib'
 import { Construct } from 'constructs'
 import type { BackendLambdas } from '../packBackendLambdas.js'