diff --git a/packages/callback-example/lib/__tests__/issuerCallback.spec.ts b/packages/callback-example/lib/__tests__/issuerCallback.spec.ts
index 92692e10..b06a17c3 100644
--- a/packages/callback-example/lib/__tests__/issuerCallback.spec.ts
+++ b/packages/callback-example/lib/__tests__/issuerCallback.spec.ts
@@ -1,6 +1,6 @@
 import { KeyObject } from 'crypto'
 
-import { uuidv4 } from '@sphereon/common'
+import { uuidv4 } from '@sphereon/oid4vc-common'
 import { CredentialRequestClientBuilder, ProofOfPossessionBuilder } from '@sphereon/oid4vci-client'
 import {
   Alg,
diff --git a/packages/callback-example/package.json b/packages/callback-example/package.json
index bd797f99..61719c50 100644
--- a/packages/callback-example/package.json
+++ b/packages/callback-example/package.json
@@ -10,7 +10,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/common": "workspace:*",
+    "@sphereon/oid4vc-common": "workspace:*",
     "@digitalcredentials/did-method-key": "^2.0.3",
     "@digitalcredentials/ed25519-signature-2020": "^3.0.2",
     "@digitalcredentials/ed25519-verification-key-2020": "^4.0.0",
diff --git a/packages/client/lib/AccessTokenClient.ts b/packages/client/lib/AccessTokenClient.ts
index 9e3e235a..89f72030 100644
--- a/packages/client/lib/AccessTokenClient.ts
+++ b/packages/client/lib/AccessTokenClient.ts
@@ -1,4 +1,4 @@
-import { createDPoP, CreateDPoPClientOpts, getCreateDPoPOptions } from '@sphereon/common';
+import { createDPoP, CreateDPoPClientOpts, getCreateDPoPOptions } from '@sphereon/oid4vc-common';
 import {
   AccessTokenRequest,
   AccessTokenRequestOpts,
diff --git a/packages/client/lib/AccessTokenClientV1_0_11.ts b/packages/client/lib/AccessTokenClientV1_0_11.ts
index cf6fec02..e795489b 100644
--- a/packages/client/lib/AccessTokenClientV1_0_11.ts
+++ b/packages/client/lib/AccessTokenClientV1_0_11.ts
@@ -1,4 +1,4 @@
-import { createDPoP, CreateDPoPClientOpts, getCreateDPoPOptions } from '@sphereon/common';
+import { createDPoP, CreateDPoPClientOpts, getCreateDPoPOptions } from '@sphereon/oid4vc-common';
 import {
   AccessTokenRequest,
   AccessTokenRequestOpts,
diff --git a/packages/client/lib/CredentialRequestClient.ts b/packages/client/lib/CredentialRequestClient.ts
index d3168016..c17cd8f5 100644
--- a/packages/client/lib/CredentialRequestClient.ts
+++ b/packages/client/lib/CredentialRequestClient.ts
@@ -1,4 +1,4 @@
-import { createDPoP, CreateDPoPClientOpts, getCreateDPoPOptions } from '@sphereon/common';
+import { createDPoP, CreateDPoPClientOpts, getCreateDPoPOptions } from '@sphereon/oid4vc-common';
 import {
   acquireDeferredCredential,
   CredentialRequestV1_0_13,
diff --git a/packages/client/lib/CredentialRequestClientV1_0_11.ts b/packages/client/lib/CredentialRequestClientV1_0_11.ts
index 03dbc46d..ee9983a4 100644
--- a/packages/client/lib/CredentialRequestClientV1_0_11.ts
+++ b/packages/client/lib/CredentialRequestClientV1_0_11.ts
@@ -1,4 +1,4 @@
-import { createDPoP, CreateDPoPClientOpts, getCreateDPoPOptions } from '@sphereon/common';
+import { createDPoP, CreateDPoPClientOpts, getCreateDPoPOptions } from '@sphereon/oid4vc-common';
 import {
   acquireDeferredCredential,
   CredentialResponse,
diff --git a/packages/client/lib/OpenID4VCIClient.ts b/packages/client/lib/OpenID4VCIClient.ts
index e764804d..f42c8e46 100644
--- a/packages/client/lib/OpenID4VCIClient.ts
+++ b/packages/client/lib/OpenID4VCIClient.ts
@@ -1,4 +1,4 @@
-import { JWK } from '@sphereon/common';
+import { JWK } from '@sphereon/oid4vc-common';
 import {
   AccessTokenResponse,
   Alg,
diff --git a/packages/client/lib/OpenID4VCIClientV1_0_11.ts b/packages/client/lib/OpenID4VCIClientV1_0_11.ts
index d88cfa72..1c8d104e 100644
--- a/packages/client/lib/OpenID4VCIClientV1_0_11.ts
+++ b/packages/client/lib/OpenID4VCIClientV1_0_11.ts
@@ -1,4 +1,4 @@
-import { JWK } from '@sphereon/common';
+import { JWK } from '@sphereon/oid4vc-common';
 import {
   AccessTokenResponse,
   Alg,
diff --git a/packages/client/lib/OpenID4VCIClientV1_0_13.ts b/packages/client/lib/OpenID4VCIClientV1_0_13.ts
index 8fbc62fa..cece9e3f 100644
--- a/packages/client/lib/OpenID4VCIClientV1_0_13.ts
+++ b/packages/client/lib/OpenID4VCIClientV1_0_13.ts
@@ -1,4 +1,4 @@
-import { JWK } from '@sphereon/common';
+import { JWK } from '@sphereon/oid4vc-common';
 import {
   AccessTokenResponse,
   Alg,
diff --git a/packages/client/lib/ProofOfPossessionBuilder.ts b/packages/client/lib/ProofOfPossessionBuilder.ts
index 37bfc6e4..d82a812f 100644
--- a/packages/client/lib/ProofOfPossessionBuilder.ts
+++ b/packages/client/lib/ProofOfPossessionBuilder.ts
@@ -1,4 +1,4 @@
-import { JWK } from '@sphereon/common';
+import { JWK } from '@sphereon/oid4vc-common';
 import {
   AccessTokenResponse,
   Alg,
diff --git a/packages/client/lib/__tests__/SphereonE2E.spec.test.ts b/packages/client/lib/__tests__/SphereonE2E.spec.test.ts
index a28bea1f..8566f8ea 100644
--- a/packages/client/lib/__tests__/SphereonE2E.spec.test.ts
+++ b/packages/client/lib/__tests__/SphereonE2E.spec.test.ts
@@ -1,6 +1,6 @@
 import * as crypto from 'crypto';
 
-import { uuidv4 } from '@sphereon/common';
+import { uuidv4 } from '@sphereon/oid4vc-common';
 import { Alg, Jwt, ProofOfPossessionCallbacks } from '@sphereon/oid4vci-common';
 import { CredentialMapper } from '@sphereon/ssi-types';
 import * as didts from '@transmute/did-key.js';
diff --git a/packages/client/lib/functions/AccessTokenUtil.ts b/packages/client/lib/functions/AccessTokenUtil.ts
index e60f5998..1659d11d 100644
--- a/packages/client/lib/functions/AccessTokenUtil.ts
+++ b/packages/client/lib/functions/AccessTokenUtil.ts
@@ -1,4 +1,4 @@
-import { uuidv4 } from '@sphereon/common';
+import { uuidv4 } from '@sphereon/oid4vc-common';
 import { AccessTokenRequest, AccessTokenRequestOpts, Jwt, OpenId4VCIVersion } from '@sphereon/oid4vci-common';
 
 import { ProofOfPossessionBuilder } from '../ProofOfPossessionBuilder';
diff --git a/packages/client/package.json b/packages/client/package.json
index 5070c723..307b0e20 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -15,7 +15,7 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@sphereon/common": "workspace:*",
+    "@sphereon/oid4vc-common": "workspace:*",
     "@sphereon/oid4vci-common": "workspace:*",
     "@sphereon/ssi-types": "0.28.0",
     "cross-fetch": "^3.1.8",
diff --git a/packages/common/lib/__tests__/dpop.spec.ts b/packages/common/lib/__tests__/dpop.spec.ts
index 1a858376..4d3c4fe0 100644
--- a/packages/common/lib/__tests__/dpop.spec.ts
+++ b/packages/common/lib/__tests__/dpop.spec.ts
@@ -119,6 +119,6 @@ describe('dpop', () => {
       },
     );
     expect(dpop).toStrictEqual(jwk);
-    expect.assertions(6);
+    expect.assertions(8);
   });
 });
diff --git a/packages/common/package.json b/packages/common/package.json
index cc1d1edf..98aa15b6 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@sphereon/common",
+  "name": "@sphereon/oid4vc-common",
   "version": "0.15.1",
   "description": "OpenID 4 Verifiable Credentials Common",
   "source": "lib/index.ts",
diff --git a/packages/did-auth-siop-adapter/lib/DidJwtAdapter.ts b/packages/did-auth-siop-adapter/lib/DidJwtAdapter.ts
index 2605e21f..31fb1fdf 100644
--- a/packages/did-auth-siop-adapter/lib/DidJwtAdapter.ts
+++ b/packages/did-auth-siop-adapter/lib/DidJwtAdapter.ts
@@ -1,4 +1,4 @@
-import { JwtHeader, JwtPayload } from '@sphereon/common'
+import { JwtHeader, JwtPayload } from '@sphereon/oid4vc-common'
 import { AuthorizationRequestPayload, IDTokenPayload, JwtIssuerWithContext, RequestObjectPayload } from '@sphereon/did-auth-siop'
 import { JwtVerifier } from '@sphereon/did-auth-siop'
 import { Resolvable } from 'did-resolver'
diff --git a/packages/did-auth-siop-adapter/lib/did/DidJWT.ts b/packages/did-auth-siop-adapter/lib/did/DidJWT.ts
index 149a2bf5..83be1769 100644
--- a/packages/did-auth-siop-adapter/lib/did/DidJWT.ts
+++ b/packages/did-auth-siop-adapter/lib/did/DidJWT.ts
@@ -1,4 +1,4 @@
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { post } from '@sphereon/did-auth-siop'
 import {
   DEFAULT_EXPIRATION_TIME,
diff --git a/packages/did-auth-siop-adapter/lib/types/SIOP.types.ts b/packages/did-auth-siop-adapter/lib/types/SIOP.types.ts
index 2ec7b231..021458f9 100644
--- a/packages/did-auth-siop-adapter/lib/types/SIOP.types.ts
+++ b/packages/did-auth-siop-adapter/lib/types/SIOP.types.ts
@@ -1,4 +1,4 @@
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { VerifyCallback as WellknownDIDVerifyCallback } from '@sphereon/wellknown-dids-client'
 import { JWTVerifyOptions } from 'did-jwt'
 import { Resolvable } from 'did-resolver'
diff --git a/packages/did-auth-siop-adapter/package.json b/packages/did-auth-siop-adapter/package.json
index b568abd4..9bdf60bc 100644
--- a/packages/did-auth-siop-adapter/package.json
+++ b/packages/did-auth-siop-adapter/package.json
@@ -10,7 +10,7 @@
     "clean": "rimraf dist coverage"
   },
   "dependencies": {
-    "@sphereon/common": "workspace:*",
+    "@sphereon/oid4vc-common": "workspace:*",
     "@sphereon/did-auth-siop": "workspace:*",
     "@sphereon/did-uni-client": "^0.6.2",
     "@sphereon/wellknown-dids-client": "^0.1.3",
diff --git a/packages/issuer-rest/lib/IssuerTokenEndpoint.ts b/packages/issuer-rest/lib/IssuerTokenEndpoint.ts
index 005e5657..3e7be1e6 100644
--- a/packages/issuer-rest/lib/IssuerTokenEndpoint.ts
+++ b/packages/issuer-rest/lib/IssuerTokenEndpoint.ts
@@ -1,4 +1,4 @@
-import { DPoPVerifyJwtCallback, JWK, uuidv4, verifyDPoP } from '@sphereon/common'
+import { DPoPVerifyJwtCallback, JWK, uuidv4, verifyDPoP } from '@sphereon/oid4vc-common'
 import { GrantTypes, PRE_AUTHORIZED_CODE_REQUIRED_ERROR, TokenError, TokenErrorResponse } from '@sphereon/oid4vci-common'
 import { assertValidAccessTokenRequest, createAccessTokenResponse, ITokenEndpointOpts, VcIssuer } from '@sphereon/oid4vci-issuer'
 import { sendErrorResponse } from '@sphereon/ssi-express-support'
diff --git a/packages/issuer-rest/lib/__tests__/IssuerTokenServer.spec.ts b/packages/issuer-rest/lib/__tests__/IssuerTokenServer.spec.ts
index bba06441..17a9a961 100644
--- a/packages/issuer-rest/lib/__tests__/IssuerTokenServer.spec.ts
+++ b/packages/issuer-rest/lib/__tests__/IssuerTokenServer.spec.ts
@@ -1,6 +1,6 @@
 import { KeyObject } from 'crypto'
 
-import { uuidv4 } from '@sphereon/common'
+import { uuidv4 } from '@sphereon/oid4vc-common'
 import {
   Alg,
   CNonceState,
diff --git a/packages/issuer-rest/lib/oid4vci-api-functions.ts b/packages/issuer-rest/lib/oid4vci-api-functions.ts
index 39f4e39f..db796f96 100644
--- a/packages/issuer-rest/lib/oid4vci-api-functions.ts
+++ b/packages/issuer-rest/lib/oid4vci-api-functions.ts
@@ -1,4 +1,4 @@
-import { uuidv4 } from '@sphereon/common'
+import { uuidv4 } from '@sphereon/oid4vc-common'
 import {
   ACCESS_TOKEN_ISSUER_REQUIRED_ERROR,
   adjustUrl,
diff --git a/packages/issuer-rest/package.json b/packages/issuer-rest/package.json
index b8c3acc2..9d9764b7 100644
--- a/packages/issuer-rest/package.json
+++ b/packages/issuer-rest/package.json
@@ -11,7 +11,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/common": "workspace:*",
+    "@sphereon/oid4vc-common": "workspace:*",
     "@sphereon/oid4vci-common": "workspace:*",
     "@sphereon/oid4vci-issuer": "workspace:*",
     "@sphereon/ssi-express-support": "0.28.0",
diff --git a/packages/issuer/lib/VcIssuer.ts b/packages/issuer/lib/VcIssuer.ts
index eb5d9b62..86b068d8 100644
--- a/packages/issuer/lib/VcIssuer.ts
+++ b/packages/issuer/lib/VcIssuer.ts
@@ -1,4 +1,4 @@
-import { uuidv4 } from '@sphereon/common'
+import { uuidv4 } from '@sphereon/oid4vc-common'
 import {
   ALG_ERROR,
   AUD_ERROR,
diff --git a/packages/issuer/lib/__tests__/MemoryCNonceStateManager.spec.ts b/packages/issuer/lib/__tests__/MemoryCNonceStateManager.spec.ts
index 83c79e54..6ad75861 100644
--- a/packages/issuer/lib/__tests__/MemoryCNonceStateManager.spec.ts
+++ b/packages/issuer/lib/__tests__/MemoryCNonceStateManager.spec.ts
@@ -1,4 +1,4 @@
-import { uuidv4 } from '@sphereon/common'
+import { uuidv4 } from '@sphereon/oid4vc-common'
 import { CNonceState, IStateManager, STATE_MISSING_ERROR } from '@sphereon/oid4vci-common'
 
 import { MemoryStates } from '../state-manager'
diff --git a/packages/issuer/lib/__tests__/VcIssuer.spec.ts b/packages/issuer/lib/__tests__/VcIssuer.spec.ts
index 469bad90..cfd07f2e 100644
--- a/packages/issuer/lib/__tests__/VcIssuer.spec.ts
+++ b/packages/issuer/lib/__tests__/VcIssuer.spec.ts
@@ -1,4 +1,4 @@
-import { uuidv4 } from '@sphereon/common'
+import { uuidv4 } from '@sphereon/oid4vc-common'
 import { OpenID4VCIClientV1_0_13 } from '@sphereon/oid4vci-client'
 import {
   Alg,
diff --git a/packages/issuer/lib/__tests__/VcIssuerBuilder.spec.ts b/packages/issuer/lib/__tests__/VcIssuerBuilder.spec.ts
index 96a2420c..a059d7a6 100644
--- a/packages/issuer/lib/__tests__/VcIssuerBuilder.spec.ts
+++ b/packages/issuer/lib/__tests__/VcIssuerBuilder.spec.ts
@@ -1,4 +1,4 @@
-import { uuidv4 } from '@sphereon/common'
+import { uuidv4 } from '@sphereon/oid4vc-common'
 import { CredentialConfigurationSupportedV1_0_13, IssuerCredentialSubjectDisplay, IssueStatus, TokenErrorResponse } from '@sphereon/oid4vci-common'
 
 import { CredentialSupportedBuilderV1_13, VcIssuerBuilder } from '../index'
diff --git a/packages/issuer/lib/functions/CredentialOfferUtils.ts b/packages/issuer/lib/functions/CredentialOfferUtils.ts
index fa8cbf43..eb106eb9 100644
--- a/packages/issuer/lib/functions/CredentialOfferUtils.ts
+++ b/packages/issuer/lib/functions/CredentialOfferUtils.ts
@@ -1,4 +1,4 @@
-import { uuidv4 } from '@sphereon/common'
+import { uuidv4 } from '@sphereon/oid4vc-common'
 import {
   CredentialIssuerMetadataOpts,
   CredentialIssuerMetadataOptsV1_0_13,
diff --git a/packages/issuer/lib/tokens/index.ts b/packages/issuer/lib/tokens/index.ts
index 46f1abcf..76c2512f 100644
--- a/packages/issuer/lib/tokens/index.ts
+++ b/packages/issuer/lib/tokens/index.ts
@@ -1,4 +1,4 @@
-import { calculateJwkThumbprint, JWK, uuidv4 } from '@sphereon/common'
+import { calculateJwkThumbprint, JWK, uuidv4 } from '@sphereon/oid4vc-common'
 import {
   AccessTokenRequest,
   AccessTokenResponse,
diff --git a/packages/issuer/package.json b/packages/issuer/package.json
index 0e8a05cd..be66ebd1 100644
--- a/packages/issuer/package.json
+++ b/packages/issuer/package.json
@@ -10,7 +10,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/common": "workspace:*",
+    "@sphereon/oid4vc-common": "workspace:*",
     "@sphereon/oid4vci-common": "workspace:*",
     "@sphereon/ssi-types": "0.28.0",
     "uuid": "^9.0.0"
diff --git a/packages/oid4vci-common/lib/functions/ProofUtil.ts b/packages/oid4vci-common/lib/functions/ProofUtil.ts
index 5fd9c91a..1a188b02 100644
--- a/packages/oid4vci-common/lib/functions/ProofUtil.ts
+++ b/packages/oid4vci-common/lib/functions/ProofUtil.ts
@@ -1,4 +1,4 @@
-import { BaseJWK, JWK } from '@sphereon/common';
+import { BaseJWK, JWK } from '@sphereon/oid4vc-common';
 import Debug from 'debug';
 import { jwtDecode } from 'jwt-decode';
 
diff --git a/packages/oid4vci-common/lib/types/Authorization.types.ts b/packages/oid4vci-common/lib/types/Authorization.types.ts
index 62117b1b..1a4ef8f4 100644
--- a/packages/oid4vci-common/lib/types/Authorization.types.ts
+++ b/packages/oid4vci-common/lib/types/Authorization.types.ts
@@ -1,4 +1,4 @@
-import { CreateDPoPClientOpts } from '@sphereon/common';
+import { CreateDPoPClientOpts } from '@sphereon/oid4vc-common';
 
 import { Alg, CredentialOfferPayload, ProofOfPossessionCallbacks, UniformCredentialOffer } from './CredentialIssuance.types';
 import {
diff --git a/packages/oid4vci-common/lib/types/ServerMetadata.ts b/packages/oid4vci-common/lib/types/ServerMetadata.ts
index 14db9d61..a17427c3 100644
--- a/packages/oid4vci-common/lib/types/ServerMetadata.ts
+++ b/packages/oid4vci-common/lib/types/ServerMetadata.ts
@@ -1,4 +1,4 @@
-import { SigningAlgo } from '@sphereon/common';
+import { SigningAlgo } from '@sphereon/oid4vc-common';
 
 export interface AuthorizationServerMetadata {
   issuer: string;
diff --git a/packages/oid4vci-common/package.json b/packages/oid4vci-common/package.json
index 3391325d..3cb1bc57 100644
--- a/packages/oid4vci-common/package.json
+++ b/packages/oid4vci-common/package.json
@@ -10,7 +10,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/common": "workspace:*",
+    "@sphereon/oid4vc-common": "workspace:*",
     "@sphereon/ssi-types": "0.28.0",
     "cross-fetch": "^3.1.8",
     "jwt-decode": "^4.0.0",
diff --git a/packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.request.spec.ts b/packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.request.spec.ts
index 5dceb3dd..da1092f3 100644
--- a/packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.request.spec.ts
+++ b/packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.request.spec.ts
@@ -1,6 +1,6 @@
 import { parse } from 'querystring'
 
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { IPresentationDefinition } from '@sphereon/pex'
 import { IProofType } from '@sphereon/ssi-types'
 
diff --git a/packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.verify.spec.ts b/packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.verify.spec.ts
index cf72d3b1..75f9b955 100644
--- a/packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.verify.spec.ts
+++ b/packages/siop-oid4vp/lib/__tests__/AuthenticationRequest.verify.spec.ts
@@ -1,4 +1,4 @@
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { IProofType } from '@sphereon/ssi-types'
 import Ajv from 'ajv'
 import * as dotenv from 'dotenv'
diff --git a/packages/siop-oid4vp/lib/__tests__/AuthenticationResponse.response.spec.ts b/packages/siop-oid4vp/lib/__tests__/AuthenticationResponse.response.spec.ts
index 9db2cbd6..47f4397f 100644
--- a/packages/siop-oid4vp/lib/__tests__/AuthenticationResponse.response.spec.ts
+++ b/packages/siop-oid4vp/lib/__tests__/AuthenticationResponse.response.spec.ts
@@ -1,4 +1,4 @@
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { IPresentationDefinition } from '@sphereon/pex'
 import {
   ICredential,
diff --git a/packages/siop-oid4vp/lib/__tests__/DidJwtTestUtils.ts b/packages/siop-oid4vp/lib/__tests__/DidJwtTestUtils.ts
index 05a8e688..a0d7328d 100644
--- a/packages/siop-oid4vp/lib/__tests__/DidJwtTestUtils.ts
+++ b/packages/siop-oid4vp/lib/__tests__/DidJwtTestUtils.ts
@@ -1,4 +1,4 @@
-import { JwtPayload, parseJWT, SigningAlgo } from '@sphereon/common'
+import { JwtPayload, parseJWT, SigningAlgo } from '@sphereon/oid4vc-common'
 import { VerifyCallback } from '@sphereon/wellknown-dids-client'
 import { createJWT, EdDSASigner, ES256KSigner, ES256Signer, hexToBytes, JWTOptions, JWTVerifyOptions, Signer, verifyJWT } from 'did-jwt'
 import { Resolvable } from 'did-resolver'
diff --git a/packages/siop-oid4vp/lib/__tests__/IT.spec.ts b/packages/siop-oid4vp/lib/__tests__/IT.spec.ts
index b0d13cdc..731383b4 100644
--- a/packages/siop-oid4vp/lib/__tests__/IT.spec.ts
+++ b/packages/siop-oid4vp/lib/__tests__/IT.spec.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events'
 
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { IPresentationDefinition } from '@sphereon/pex'
 import { CredentialMapper, IPresentation, IProofType, IVerifiableCredential, W3CVerifiablePresentation } from '@sphereon/ssi-types'
 import nock from 'nock'
diff --git a/packages/siop-oid4vp/lib/__tests__/OP.request.spec.ts b/packages/siop-oid4vp/lib/__tests__/OP.request.spec.ts
index 3ba7100d..707b7a60 100644
--- a/packages/siop-oid4vp/lib/__tests__/OP.request.spec.ts
+++ b/packages/siop-oid4vp/lib/__tests__/OP.request.spec.ts
@@ -1,4 +1,4 @@
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { IProofType } from '@sphereon/ssi-types'
 import nock from 'nock'
 
diff --git a/packages/siop-oid4vp/lib/__tests__/PresentationExchange.spec.ts b/packages/siop-oid4vp/lib/__tests__/PresentationExchange.spec.ts
index 4ef2f0ff..67703968 100644
--- a/packages/siop-oid4vp/lib/__tests__/PresentationExchange.spec.ts
+++ b/packages/siop-oid4vp/lib/__tests__/PresentationExchange.spec.ts
@@ -1,4 +1,4 @@
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { PresentationDefinitionV1 } from '@sphereon/pex-models'
 import { CredentialMapper, IPresentation, IProofType, IVerifiableCredential } from '@sphereon/ssi-types'
 import { W3CVerifiablePresentation } from '@sphereon/ssi-types/src/types/w3c-vc'
diff --git a/packages/siop-oid4vp/lib/__tests__/RP.request.spec.ts b/packages/siop-oid4vp/lib/__tests__/RP.request.spec.ts
index 4ece679f..a3ff29c8 100644
--- a/packages/siop-oid4vp/lib/__tests__/RP.request.spec.ts
+++ b/packages/siop-oid4vp/lib/__tests__/RP.request.spec.ts
@@ -1,4 +1,4 @@
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { IProofType } from '@sphereon/ssi-types'
 
 import {
diff --git a/packages/siop-oid4vp/lib/__tests__/SdJwt.spec.ts b/packages/siop-oid4vp/lib/__tests__/SdJwt.spec.ts
index 8778cba4..530d8bdc 100644
--- a/packages/siop-oid4vp/lib/__tests__/SdJwt.spec.ts
+++ b/packages/siop-oid4vp/lib/__tests__/SdJwt.spec.ts
@@ -1,6 +1,6 @@
 import { createHash } from 'node:crypto'
 
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { IPresentationDefinition, SdJwtDecodedVerifiableCredentialWithKbJwtInput } from '@sphereon/pex'
 import { OriginalVerifiableCredential } from '@sphereon/ssi-types'
 
diff --git a/packages/siop-oid4vp/lib/__tests__/TestUtils.ts b/packages/siop-oid4vp/lib/__tests__/TestUtils.ts
index 260ac76f..cbcb19f5 100644
--- a/packages/siop-oid4vp/lib/__tests__/TestUtils.ts
+++ b/packages/siop-oid4vp/lib/__tests__/TestUtils.ts
@@ -1,6 +1,6 @@
 import crypto from 'crypto'
 
-import { JwtPayload, parseJWT, SigningAlgo, uuidv4 } from '@sphereon/common'
+import { JwtPayload, parseJWT, SigningAlgo, uuidv4 } from '@sphereon/oid4vc-common'
 import { IProofType } from '@sphereon/ssi-types'
 import base58 from 'bs58'
 import { ethers } from 'ethers'
diff --git a/packages/siop-oid4vp/lib/__tests__/e2e/EBSI.spec.ts b/packages/siop-oid4vp/lib/__tests__/e2e/EBSI.spec.ts
index b4550f8c..0c4a3c04 100644
--- a/packages/siop-oid4vp/lib/__tests__/e2e/EBSI.spec.ts
+++ b/packages/siop-oid4vp/lib/__tests__/e2e/EBSI.spec.ts
@@ -1,7 +1,7 @@
 import { getResolver as getKeyResolver } from '@cef-ebsi/key-did-resolver'
 // import { EbsiWallet } from '@cef-ebsi/wallet-lib';
 import EbsiWallet from '@cef-ebsi/wallet-lib'
-import { SigningAlgo, uuidv4 } from '@sphereon/common'
+import { SigningAlgo, uuidv4 } from '@sphereon/oid4vc-common'
 import { PresentationSignCallBackParams } from '@sphereon/pex'
 import { parseDid, W3CVerifiablePresentation } from '@sphereon/ssi-types'
 import { Resolver } from 'did-resolver'
diff --git a/packages/siop-oid4vp/lib/__tests__/e2e/mattr.launchpad.spec.ts b/packages/siop-oid4vp/lib/__tests__/e2e/mattr.launchpad.spec.ts
index 71d27764..63750dff 100644
--- a/packages/siop-oid4vp/lib/__tests__/e2e/mattr.launchpad.spec.ts
+++ b/packages/siop-oid4vp/lib/__tests__/e2e/mattr.launchpad.spec.ts
@@ -1,4 +1,4 @@
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { PresentationSignCallBackParams, PresentationSubmissionLocation } from '@sphereon/pex'
 import { W3CVerifiablePresentation } from '@sphereon/ssi-types'
 import * as ed25519 from '@transmute/did-key-ed25519'
diff --git a/packages/siop-oid4vp/lib/__tests__/functions/DidSiopMetadata.spec.ts b/packages/siop-oid4vp/lib/__tests__/functions/DidSiopMetadata.spec.ts
index ca2d5d91..0a88067a 100644
--- a/packages/siop-oid4vp/lib/__tests__/functions/DidSiopMetadata.spec.ts
+++ b/packages/siop-oid4vp/lib/__tests__/functions/DidSiopMetadata.spec.ts
@@ -1,4 +1,4 @@
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { Format } from '@sphereon/pex-models'
 import { IProofType } from '@sphereon/ssi-types'
 
diff --git a/packages/siop-oid4vp/lib/__tests__/regressions/ClientIdIsObject.spec.ts b/packages/siop-oid4vp/lib/__tests__/regressions/ClientIdIsObject.spec.ts
index 91eb4ed6..14ec9c85 100644
--- a/packages/siop-oid4vp/lib/__tests__/regressions/ClientIdIsObject.spec.ts
+++ b/packages/siop-oid4vp/lib/__tests__/regressions/ClientIdIsObject.spec.ts
@@ -1,4 +1,4 @@
-import { parseJWT, SigningAlgo } from '@sphereon/common'
+import { parseJWT, SigningAlgo } from '@sphereon/oid4vc-common'
 
 import { PassBy, ResponseType, RevocationVerification, RP, Scope, SubjectType, SupportedVersion } from '../..'
 import { internalSignature } from '../DidJwtTestUtils'
diff --git a/packages/siop-oid4vp/lib/__tests__/spec-compliance/jwtVCPresentationProfile.spec.ts b/packages/siop-oid4vp/lib/__tests__/spec-compliance/jwtVCPresentationProfile.spec.ts
index 7f6ec6af..ffb74f8b 100644
--- a/packages/siop-oid4vp/lib/__tests__/spec-compliance/jwtVCPresentationProfile.spec.ts
+++ b/packages/siop-oid4vp/lib/__tests__/spec-compliance/jwtVCPresentationProfile.spec.ts
@@ -1,4 +1,4 @@
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { PresentationSignCallBackParams } from '@sphereon/pex'
 import { IProofType } from '@sphereon/ssi-types'
 import * as jose from 'jose'
diff --git a/packages/siop-oid4vp/lib/authorization-request/AuthorizationRequest.ts b/packages/siop-oid4vp/lib/authorization-request/AuthorizationRequest.ts
index 9fd7bb2f..baad622f 100644
--- a/packages/siop-oid4vp/lib/authorization-request/AuthorizationRequest.ts
+++ b/packages/siop-oid4vp/lib/authorization-request/AuthorizationRequest.ts
@@ -1,4 +1,4 @@
-import { parseJWT } from '@sphereon/common'
+import { parseJWT } from '@sphereon/oid4vc-common'
 
 import { PresentationDefinitionWithLocation } from '../authorization-response'
 import { PresentationExchange } from '../authorization-response/PresentationExchange'
diff --git a/packages/siop-oid4vp/lib/authorization-request/URI.ts b/packages/siop-oid4vp/lib/authorization-request/URI.ts
index 5848382f..53ee1157 100644
--- a/packages/siop-oid4vp/lib/authorization-request/URI.ts
+++ b/packages/siop-oid4vp/lib/authorization-request/URI.ts
@@ -1,4 +1,4 @@
-import { parseJWT } from '@sphereon/common'
+import { parseJWT } from '@sphereon/oid4vc-common'
 
 import { PresentationExchange } from '../authorization-response/PresentationExchange'
 import { decodeUriAsJson, encodeJsonAsURI, fetchByReferenceOrUseByValue } from '../helpers'
diff --git a/packages/siop-oid4vp/lib/authorization-request/types.ts b/packages/siop-oid4vp/lib/authorization-request/types.ts
index 01f761c3..a2faeddc 100644
--- a/packages/siop-oid4vp/lib/authorization-request/types.ts
+++ b/packages/siop-oid4vp/lib/authorization-request/types.ts
@@ -1,4 +1,4 @@
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { Hasher } from '@sphereon/ssi-types'
 
 import { PresentationDefinitionPayloadOpts } from '../authorization-response'
diff --git a/packages/siop-oid4vp/lib/authorization-response/OpenID4VP.ts b/packages/siop-oid4vp/lib/authorization-response/OpenID4VP.ts
index b02d9165..0810a61e 100644
--- a/packages/siop-oid4vp/lib/authorization-response/OpenID4VP.ts
+++ b/packages/siop-oid4vp/lib/authorization-response/OpenID4VP.ts
@@ -1,4 +1,4 @@
-import { parseJWT } from '@sphereon/common'
+import { parseJWT } from '@sphereon/oid4vc-common'
 import { IPresentationDefinition, PEX } from '@sphereon/pex'
 import { Format } from '@sphereon/pex-models'
 import {
diff --git a/packages/siop-oid4vp/lib/authorization-response/ResponseRegistration.ts b/packages/siop-oid4vp/lib/authorization-response/ResponseRegistration.ts
index 3b839065..e6ec4869 100644
--- a/packages/siop-oid4vp/lib/authorization-response/ResponseRegistration.ts
+++ b/packages/siop-oid4vp/lib/authorization-response/ResponseRegistration.ts
@@ -1,4 +1,4 @@
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 
 import { LanguageTagUtils, removeNullUndefined } from '../helpers'
 import { DiscoveryMetadataOpts, DiscoveryMetadataPayload, ResponseIss, ResponseType, Schema, Scope, SubjectType } from '../types'
diff --git a/packages/siop-oid4vp/lib/authorization-response/types.ts b/packages/siop-oid4vp/lib/authorization-response/types.ts
index d438d813..d3e30fb7 100644
--- a/packages/siop-oid4vp/lib/authorization-response/types.ts
+++ b/packages/siop-oid4vp/lib/authorization-response/types.ts
@@ -1,4 +1,4 @@
-import { JwtIssuer } from '@sphereon/common'
+import { JwtIssuer } from '@sphereon/oid4vc-common'
 import { IPresentationDefinition, PresentationSignCallBackParams } from '@sphereon/pex'
 import { Format } from '@sphereon/pex-models'
 import { CompactSdJwtVc, Hasher, PresentationSubmission, W3CVerifiablePresentation } from '@sphereon/ssi-types'
diff --git a/packages/siop-oid4vp/lib/helpers/State.ts b/packages/siop-oid4vp/lib/helpers/State.ts
index 16cf5fcb..eca202b7 100644
--- a/packages/siop-oid4vp/lib/helpers/State.ts
+++ b/packages/siop-oid4vp/lib/helpers/State.ts
@@ -1,4 +1,4 @@
-import { uuidv4 } from '@sphereon/common'
+import { uuidv4 } from '@sphereon/oid4vc-common'
 import SHA from 'sha.js'
 
 import { base64urlEncodeBuffer } from './Encodings'
diff --git a/packages/siop-oid4vp/lib/id-token/IDToken.ts b/packages/siop-oid4vp/lib/id-token/IDToken.ts
index 8500862d..ac142218 100644
--- a/packages/siop-oid4vp/lib/id-token/IDToken.ts
+++ b/packages/siop-oid4vp/lib/id-token/IDToken.ts
@@ -1,4 +1,4 @@
-import { calculateJwkThumbprintUri, JwtHeader, JwtIssuer, parseJWT } from '@sphereon/common'
+import { calculateJwkThumbprintUri, JwtHeader, JwtIssuer, parseJWT } from '@sphereon/oid4vc-common'
 
 import { AuthorizationResponseOpts, VerifyAuthorizationResponseOpts } from '../authorization-response'
 import { assertValidVerifyOpts } from '../authorization-response/Opts'
diff --git a/packages/siop-oid4vp/lib/op/OP.ts b/packages/siop-oid4vp/lib/op/OP.ts
index 6f91a3f9..c55e59fb 100644
--- a/packages/siop-oid4vp/lib/op/OP.ts
+++ b/packages/siop-oid4vp/lib/op/OP.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events'
 
-import { JwtIssuer, uuidv4 } from '@sphereon/common'
+import { JwtIssuer, uuidv4 } from '@sphereon/oid4vc-common'
 import { IIssuerId } from '@sphereon/ssi-types'
 
 import { AuthorizationRequest, URI, VerifyAuthorizationRequestOpts } from '../authorization-request'
diff --git a/packages/siop-oid4vp/lib/request-object/Payload.ts b/packages/siop-oid4vp/lib/request-object/Payload.ts
index 021fd9cb..ab6affea 100644
--- a/packages/siop-oid4vp/lib/request-object/Payload.ts
+++ b/packages/siop-oid4vp/lib/request-object/Payload.ts
@@ -1,4 +1,4 @@
-import { uuidv4 } from '@sphereon/common'
+import { uuidv4 } from '@sphereon/oid4vc-common'
 
 import { CreateAuthorizationRequestOpts, createPresentationDefinitionClaimsProperties } from '../authorization-request'
 import { createRequestRegistration } from '../authorization-request/RequestRegistration'
diff --git a/packages/siop-oid4vp/lib/request-object/RequestObject.ts b/packages/siop-oid4vp/lib/request-object/RequestObject.ts
index aac61e24..e88bcd8e 100644
--- a/packages/siop-oid4vp/lib/request-object/RequestObject.ts
+++ b/packages/siop-oid4vp/lib/request-object/RequestObject.ts
@@ -1,4 +1,4 @@
-import { JwtIssuer, parseJWT } from '@sphereon/common'
+import { JwtIssuer, parseJWT } from '@sphereon/oid4vc-common'
 
 import { ClaimPayloadCommonOpts, ClaimPayloadOptsVID1, CreateAuthorizationRequestOpts } from '../authorization-request'
 import { assertValidAuthorizationRequestOpts } from '../authorization-request/Opts'
diff --git a/packages/siop-oid4vp/lib/request-object/types.ts b/packages/siop-oid4vp/lib/request-object/types.ts
index 8ea041e4..62f7cb8a 100644
--- a/packages/siop-oid4vp/lib/request-object/types.ts
+++ b/packages/siop-oid4vp/lib/request-object/types.ts
@@ -1,4 +1,4 @@
-import { JwtIssuer } from '@sphereon/common'
+import { JwtIssuer } from '@sphereon/oid4vc-common'
 
 import { ClaimPayloadCommonOpts, RequestObjectPayloadOpts } from '../authorization-request'
 import { ObjectBy } from '../types'
diff --git a/packages/siop-oid4vp/lib/rp/RP.ts b/packages/siop-oid4vp/lib/rp/RP.ts
index 1e43d77f..d0395a05 100644
--- a/packages/siop-oid4vp/lib/rp/RP.ts
+++ b/packages/siop-oid4vp/lib/rp/RP.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events'
 
-import { JwtIssuer, uuidv4 } from '@sphereon/common'
+import { JwtIssuer, uuidv4 } from '@sphereon/oid4vc-common'
 import { Hasher } from '@sphereon/ssi-types'
 
 import {
diff --git a/packages/siop-oid4vp/lib/types/SIOP.types.ts b/packages/siop-oid4vp/lib/types/SIOP.types.ts
index 55321608..406bdca0 100644
--- a/packages/siop-oid4vp/lib/types/SIOP.types.ts
+++ b/packages/siop-oid4vp/lib/types/SIOP.types.ts
@@ -1,6 +1,6 @@
 // noinspection JSUnusedGlobalSymbols
 
-import { SigningAlgo } from '@sphereon/common'
+import { SigningAlgo } from '@sphereon/oid4vc-common'
 import { Format, PresentationDefinitionV1, PresentationDefinitionV2 } from '@sphereon/pex-models'
 import {
   AdditionalClaims,
diff --git a/packages/siop-oid4vp/lib/types/VpJwtIssuer.ts b/packages/siop-oid4vp/lib/types/VpJwtIssuer.ts
index 716c91fc..6d6b70bb 100644
--- a/packages/siop-oid4vp/lib/types/VpJwtIssuer.ts
+++ b/packages/siop-oid4vp/lib/types/VpJwtIssuer.ts
@@ -1,4 +1,4 @@
-import { CreateJwtCallback as CreateJwtCallbackBase, JwtIssuanceContextBase, JwtIssuer } from '@sphereon/common'
+import { CreateJwtCallback as CreateJwtCallbackBase, JwtIssuanceContextBase, JwtIssuer } from '@sphereon/oid4vc-common'
 
 import { AuthorizationResponseOpts } from '../authorization-response'
 
diff --git a/packages/siop-oid4vp/lib/types/VpJwtVerifier.ts b/packages/siop-oid4vp/lib/types/VpJwtVerifier.ts
index 4fb055a0..4982094b 100644
--- a/packages/siop-oid4vp/lib/types/VpJwtVerifier.ts
+++ b/packages/siop-oid4vp/lib/types/VpJwtVerifier.ts
@@ -10,12 +10,11 @@ import {
   JwtHeader,
   JwtPayload,
   OpenIdFederationJwtVerifier,
-  SigningAlgo,
   VerifyJwtCallbackBase,
   X5cJwtVerifier,
-} from '@sphereon/common'
-import { getJwtVerifierWithContext as getJwtVerifierWithContextCommon } from '@sphereon/common'
-import { JwtType, parseJWT } from '@sphereon/common'
+} from '@sphereon/oid4vc-common'
+import { getJwtVerifierWithContext as getJwtVerifierWithContextCommon } from '@sphereon/oid4vc-common'
+import { JwtType, parseJWT } from '@sphereon/oid4vc-common'
 
 import SIOPErrors from './Errors'
 import { RequestObjectPayload } from './SIOP.types'
diff --git a/packages/siop-oid4vp/package.json b/packages/siop-oid4vp/package.json
index 0a76de16..5a9fd207 100644
--- a/packages/siop-oid4vp/package.json
+++ b/packages/siop-oid4vp/package.json
@@ -13,7 +13,7 @@
     "uninstall": "rimraf dist coverage node_modules"
   },
   "dependencies": {
-    "@sphereon/common": "workspace:*",
+    "@sphereon/oid4vc-common": "workspace:*",
     "@astronautlabs/jsonpath": "^1.1.2",
     "@sphereon/did-uni-client": "^0.6.2",
     "@sphereon/pex": "^3.3.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index bf0afb94..0f244f07 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -65,7 +65,7 @@ importers:
       '@digitalcredentials/vc':
         specifier: ^5.0.0
         version: 5.0.0(encoding@0.1.13)(expo@48.0.21(@babel/core@7.24.9)(encoding@0.1.13))(react-native@0.71.19(@babel/core@7.24.9)(@babel/preset-env@7.24.8(@babel/core@7.24.9))(encoding@0.1.13)(react@18.3.1))(web-streams-polyfill@3.3.3)
-      '@sphereon/common':
+      '@sphereon/oid4vc-common':
         specifier: workspace:*
         version: link:../common
       '@sphereon/oid4vci-client':
@@ -114,7 +114,7 @@ importers:
 
   packages/client:
     dependencies:
-      '@sphereon/common':
+      '@sphereon/oid4vc-common':
         specifier: workspace:*
         version: link:../common
       '@sphereon/oid4vci-common':
@@ -239,15 +239,15 @@ importers:
 
   packages/did-auth-siop-adapter:
     dependencies:
-      '@sphereon/common':
-        specifier: workspace:*
-        version: link:../common
       '@sphereon/did-auth-siop':
         specifier: workspace:*
         version: link:../siop-oid4vp
       '@sphereon/did-uni-client':
         specifier: ^0.6.2
         version: 0.6.3(encoding@0.1.13)
+      '@sphereon/oid4vc-common':
+        specifier: workspace:*
+        version: link:../common
       '@sphereon/wellknown-dids-client':
         specifier: ^0.1.3
         version: 0.1.3(encoding@0.1.13)
@@ -270,7 +270,7 @@ importers:
 
   packages/issuer:
     dependencies:
-      '@sphereon/common':
+      '@sphereon/oid4vc-common':
         specifier: workspace:*
         version: link:../common
       '@sphereon/oid4vci-common':
@@ -307,7 +307,7 @@ importers:
 
   packages/issuer-rest:
     dependencies:
-      '@sphereon/common':
+      '@sphereon/oid4vc-common':
         specifier: workspace:*
         version: link:../common
       '@sphereon/oid4vci-common':
@@ -395,7 +395,7 @@ importers:
 
   packages/oid4vci-common:
     dependencies:
-      '@sphereon/common':
+      '@sphereon/oid4vc-common':
         specifier: workspace:*
         version: link:../common
       '@sphereon/ssi-types':
@@ -435,12 +435,12 @@ importers:
       '@astronautlabs/jsonpath':
         specifier: ^1.1.2
         version: 1.1.2
-      '@sphereon/common':
-        specifier: workspace:*
-        version: link:../common
       '@sphereon/did-uni-client':
         specifier: ^0.6.2
         version: 0.6.3(encoding@0.1.13)
+      '@sphereon/oid4vc-common':
+        specifier: workspace:*
+        version: link:../common
       '@sphereon/pex':
         specifier: ^3.3.2
         version: 3.3.3