diff --git a/sample-code/src/ai-api/deployment-api.ts b/sample-code/src/ai-api/deployment-api.ts
index d4adb29e..448b7db4 100644
--- a/sample-code/src/ai-api/deployment-api.ts
+++ b/sample-code/src/ai-api/deployment-api.ts
@@ -1,10 +1,10 @@
-import {
+import { DeploymentApi } from '@sap-ai-sdk/ai-api';
+import type {
   AiDeploymentCreationResponse,
   AiDeploymentDeletionResponse,
   AiDeploymentList,
   AiDeploymentModificationResponse,
-  AiDeploymentResponseWithDetails,
-  DeploymentApi
+  AiDeploymentResponseWithDetails
 } from '@sap-ai-sdk/ai-api';
 
 /**
diff --git a/sample-code/src/ai-api/scenario-api.ts b/sample-code/src/ai-api/scenario-api.ts
index 1bf0d412..c460acaf 100644
--- a/sample-code/src/ai-api/scenario-api.ts
+++ b/sample-code/src/ai-api/scenario-api.ts
@@ -1,4 +1,5 @@
-import { ScenarioApi, AiScenarioList, AiModelList } from '@sap-ai-sdk/ai-api';
+import { ScenarioApi } from '@sap-ai-sdk/ai-api';
+import type { AiScenarioList, AiModelList } from '@sap-ai-sdk/ai-api';
 
 /**
  * Get all scenarios.
diff --git a/sample-code/src/index.ts b/sample-code/src/index.ts
index 8e5c28d9..584673da 100644
--- a/sample-code/src/index.ts
+++ b/sample-code/src/index.ts
@@ -23,5 +23,10 @@ export {
   createDeployment,
   stopDeployment,
   deleteDeployment
+  // eslint-disable-next-line import/no-internal-modules
 } from './ai-api/deployment-api.js';
-export { getScenarios, getModelsInScenario } from './ai-api/scenario-api.js';
+export {
+  getScenarios,
+  getModelsInScenario
+  // eslint-disable-next-line import/no-internal-modules
+} from './ai-api/scenario-api.js';
diff --git a/sample-code/src/server.ts b/sample-code/src/server.ts
index df334bf6..36074d78 100644
--- a/sample-code/src/server.ts
+++ b/sample-code/src/server.ts
@@ -1,6 +1,5 @@
 /* eslint-disable no-console */
 import express from 'express';
-import { AiApiError } from '@sap-ai-sdk/ai-api';
 import {
   chatCompletion,
   computeEmbedding
@@ -13,13 +12,21 @@ import {
   orchestrationOutputFiltering,
   orchestrationRequestConfig
 } from './orchestration.js';
-import { getDeployments, createDeployment } from './ai-api/deployment-api.js';
-import { getModelsInScenario } from './ai-api/scenario-api.js';
+import {
+  getDeployments,
+  createDeployment
+  // eslint-disable-next-line import/no-internal-modules
+} from './ai-api/deployment-api.js';
+import {
+  getModelsInScenario
+  // eslint-disable-next-line import/no-internal-modules
+} from './ai-api/scenario-api.js';
 import {
   invokeChain,
   invokeRagChain,
   invoke
 } from './langchain-azure-openai.js';
+import type { AiApiError } from '@sap-ai-sdk/ai-api';
 import type { OrchestrationResponse } from '@sap-ai-sdk/orchestration';
 
 const app = express();
diff --git a/tests/e2e-tests/src/deployment-api.test.ts b/tests/e2e-tests/src/deployment-api.test.ts
index 25b7d488..94d16b46 100644
--- a/tests/e2e-tests/src/deployment-api.test.ts
+++ b/tests/e2e-tests/src/deployment-api.test.ts
@@ -1,4 +1,3 @@
-import { AiApiError, AiDeploymentList } from '@sap-ai-sdk/ai-api';
 import {
   getDeployment,
   getDeployments,
@@ -12,6 +11,7 @@ import {
   resourceGroup,
   waitForDeploymentToReachStatus
 } from './utils/ai-api-utils.js';
+import type { AiApiError, AiDeploymentList } from '@sap-ai-sdk/ai-api';
 
 loadEnv();
 
diff --git a/tests/e2e-tests/src/utils/ai-api-utils.ts b/tests/e2e-tests/src/utils/ai-api-utils.ts
index 2efc22db..5889750f 100644
--- a/tests/e2e-tests/src/utils/ai-api-utils.ts
+++ b/tests/e2e-tests/src/utils/ai-api-utils.ts
@@ -1,6 +1,6 @@
 import retry from 'async-retry';
-import { AiDeployment } from '@sap-ai-sdk/ai-api';
 import { getDeployment } from '@sap-ai-sdk/sample-code';
+import type { AiDeployment } from '@sap-ai-sdk/ai-api';
 
 /**
  * @internal
diff --git a/tests/e2e-tests/src/utils/cleanup-deployments.ts b/tests/e2e-tests/src/utils/cleanup-deployments.ts
index b57e29f1..1e3f0aac 100644
--- a/tests/e2e-tests/src/utils/cleanup-deployments.ts
+++ b/tests/e2e-tests/src/utils/cleanup-deployments.ts
@@ -1,5 +1,4 @@
 import { createLogger } from '@sap-cloud-sdk/util';
-import { AiApiError } from '@sap-ai-sdk/ai-api';
 import {
   deleteDeployment,
   getDeployments,
@@ -10,6 +9,7 @@ import {
   resourceGroup,
   waitForDeploymentToReachStatus
 } from './ai-api-utils.js';
+import type { AiApiError } from '@sap-ai-sdk/ai-api';
 
 loadEnv();