diff --git a/packages/callback-example/lib/__tests__/issuerCallback.spec.ts b/packages/callback-example/lib/__tests__/issuerCallback.spec.ts
index b06a17c3..62bafbe5 100644
--- a/packages/callback-example/lib/__tests__/issuerCallback.spec.ts
+++ b/packages/callback-example/lib/__tests__/issuerCallback.spec.ts
@@ -15,7 +15,7 @@ import {
   OpenId4VCIVersion,
   ProofOfPossession,
 } from '@sphereon/oid4vci-common'
-import { CredentialOfferSession } from '@sphereon/oid4vci-common/dist'
+import { CredentialOfferSession } from '@sphereon/oid4vci-common'
 import { CredentialSupportedBuilderV1_13, VcIssuer, VcIssuerBuilder } from '@sphereon/oid4vci-issuer'
 import { MemoryStates } from '@sphereon/oid4vci-issuer'
 import { CredentialDataSupplierResult } from '@sphereon/oid4vci-issuer/dist/types'
diff --git a/packages/client/lib/CredentialRequestClient.ts b/packages/client/lib/CredentialRequestClient.ts
index d38b0ab9..9b53ccb8 100644
--- a/packages/client/lib/CredentialRequestClient.ts
+++ b/packages/client/lib/CredentialRequestClient.ts
@@ -16,7 +16,7 @@ import {
   UniformCredentialRequest,
   URL_NOT_VALID,
 } from '@sphereon/oid4vci-common';
-import { ExperimentalSubjectIssuance } from '@sphereon/oid4vci-common/dist/experimental/holder-vci';
+import { ExperimentalSubjectIssuance } from '@sphereon/oid4vci-common';
 import { CredentialFormat } from '@sphereon/ssi-types';
 import Debug from 'debug';
 
diff --git a/packages/issuer/lib/VcIssuer.ts b/packages/issuer/lib/VcIssuer.ts
index 8670f5fd..e9d6eb5b 100644
--- a/packages/issuer/lib/VcIssuer.ts
+++ b/packages/issuer/lib/VcIssuer.ts
@@ -38,8 +38,8 @@ import {
   TYP_ERROR,
   URIState,
 } from '@sphereon/oid4vci-common'
-import { CredentialEventNames, CredentialOfferEventNames, EVENTS } from '@sphereon/oid4vci-common/dist/events'
-import { CredentialIssuerMetadataOptsV1_0_13 } from '@sphereon/oid4vci-common/dist/types/v1_0_13.types'
+import { CredentialEventNames, CredentialOfferEventNames, EVENTS } from '@sphereon/oid4vci-common'
+import { CredentialIssuerMetadataOptsV1_0_13 } from '@sphereon/oid4vci-common'
 import { CompactSdJwtVc, CredentialMapper, InitiatorType, SubSystem, System, W3CVerifiableCredential } from '@sphereon/ssi-types'
 
 import { assertValidPinNumber, createCredentialOfferObject, createCredentialOfferURIFromObject } from './functions'
diff --git a/packages/issuer/lib/builder/VcIssuerBuilder.ts b/packages/issuer/lib/builder/VcIssuerBuilder.ts
index 7aa3c567..5094197c 100644
--- a/packages/issuer/lib/builder/VcIssuerBuilder.ts
+++ b/packages/issuer/lib/builder/VcIssuerBuilder.ts
@@ -11,7 +11,7 @@ import {
   TxCode,
   URIState,
 } from '@sphereon/oid4vci-common'
-import { CredentialIssuerMetadataOptsV1_0_13 } from '@sphereon/oid4vci-common/dist/types/v1_0_13.types'
+import { CredentialIssuerMetadataOptsV1_0_13 } from '@sphereon/oid4vci-common'
 
 import { VcIssuer } from '../VcIssuer'
 import { MemoryStates } from '../state-manager'
diff --git a/packages/issuer/lib/state-manager/LookupStateManager.ts b/packages/issuer/lib/state-manager/LookupStateManager.ts
index b1d3adc5..ffdc50b9 100644
--- a/packages/issuer/lib/state-manager/LookupStateManager.ts
+++ b/packages/issuer/lib/state-manager/LookupStateManager.ts
@@ -1,7 +1,7 @@
 // noinspection ES6MissingAwait
 
 import { IStateManager } from '@sphereon/oid4vci-common'
-import { StateType } from '@sphereon/oid4vci-common/dist/types/StateManager.types'
+import { StateType } from '@sphereon/oid4vci-common'
 
 export class LookupStateManager<K extends StateType, V extends StateType> implements IStateManager<V> {
   constructor(
diff --git a/packages/oid4vci-common/lib/types/CredentialIssuance.types.ts b/packages/oid4vci-common/lib/types/CredentialIssuance.types.ts
index 1f2275ef..439021a7 100644
--- a/packages/oid4vci-common/lib/types/CredentialIssuance.types.ts
+++ b/packages/oid4vci-common/lib/types/CredentialIssuance.types.ts
@@ -1,5 +1,5 @@
 import { W3CVerifiableCredential } from '@sphereon/ssi-types';
-import { BaseJWK } from 'common/dist';
+import { BaseJWK } from 'common';
 
 import { ExperimentalSubjectIssuance } from '../experimental/holder-vci';
 
diff --git a/packages/oid4vci-common/lib/types/v1_0_13.types.ts b/packages/oid4vci-common/lib/types/v1_0_13.types.ts
index 789df449..270b53d7 100644
--- a/packages/oid4vci-common/lib/types/v1_0_13.types.ts
+++ b/packages/oid4vci-common/lib/types/v1_0_13.types.ts
@@ -1,4 +1,4 @@
-import { JWK } from 'common/dist';
+import { JWK } from 'common';
 
 import { ExperimentalSubjectIssuance } from '../experimental/holder-vci';