diff --git a/packages/data-store/src/__tests__/contact.store.test.ts b/packages/data-store/src/__tests__/contact.store.test.ts
index 3a004ba28..8208540c2 100644
--- a/packages/data-store/src/__tests__/contact.store.test.ts
+++ b/packages/data-store/src/__tests__/contact.store.test.ts
@@ -370,10 +370,10 @@ describe('Contact store tests', (): void => {
         {
           alias: 'test_alias4',
           origin: IdentityOrigin.EXTERNAL,
-          roles: [CredentialRole.FEDERATION_OPERATOR],
+          roles: [CredentialRole.FEDERATION_TRUST_ANCHOR],
           identifier: {
-            type: CorrelationIdentifierType.DID,
-            correlationId: 'example_did4',
+            type: CorrelationIdentifierType.URL,
+            correlationId: 'example_url4',
           },
         },
       ],
@@ -1220,10 +1220,10 @@ describe('Contact store tests', (): void => {
         {
           alias: 'test_alias4',
           origin: IdentityOrigin.EXTERNAL,
-          roles: [CredentialRole.FEDERATION_OPERATOR],
+          roles: [CredentialRole.FEDERATION_TRUST_ANCHOR],
           identifier: {
-            type: CorrelationIdentifierType.DID,
-            correlationId: 'example_did4',
+            type: CorrelationIdentifierType.URL,
+            correlationId: 'example_url4',
           },
         },
       ],
@@ -1238,7 +1238,7 @@ describe('Contact store tests', (): void => {
       CredentialRole.VERIFIER,
       CredentialRole.ISSUER,
       CredentialRole.HOLDER,
-      CredentialRole.FEDERATION_OPERATOR
+      CredentialRole.FEDERATION_TRUST_ANCHOR
     ])
   })
 
diff --git a/packages/data-store/src/migrations/postgres/1708525189001-CreateDigitalCredential.ts b/packages/data-store/src/migrations/postgres/1708525189001-CreateDigitalCredential.ts
index 10653b8c5..0c5aa9839 100644
--- a/packages/data-store/src/migrations/postgres/1708525189001-CreateDigitalCredential.ts
+++ b/packages/data-store/src/migrations/postgres/1708525189001-CreateDigitalCredential.ts
@@ -7,7 +7,7 @@ export class CreateDigitalCredential1708525189001 implements MigrationInterface
     await queryRunner.query(`CREATE TYPE "digital_document_type" AS ENUM('VC', 'VP', 'C', 'P')`)
     await queryRunner.query(`CREATE TYPE "digital_regulation_type" AS ENUM('PID', 'QEAA', 'EAA', 'NON_REGULATED')`)
     await queryRunner.query(`CREATE TYPE "digital_credential_document_format" AS ENUM('JSON_LD', 'JWT', 'SD_JWT', 'MSO_MDOC')`)
-    await queryRunner.query(`CREATE TYPE "digital_credential_credential_role" AS ENUM('ISSUER', 'VERIFIER', 'HOLDER', 'FEDERATION OPERATOR')`)
+    await queryRunner.query(`CREATE TYPE "digital_credential_credential_role" AS ENUM('ISSUER', 'VERIFIER', 'HOLDER', 'FEDERATION_TRUST_ANCHOR')`)
     await queryRunner.query(`CREATE TYPE "digital_credential_correlation_type" AS ENUM('DID', 'KID', 'URL', 'X509_SAN')`)
     await queryRunner.query(`CREATE TYPE "digital_credential_state_type" AS ENUM('REVOKED', 'VERIFIED', 'EXPIRED')`)
 
diff --git a/packages/data-store/src/migrations/sqlite/1708525189002-CreateDigitalCredential.ts b/packages/data-store/src/migrations/sqlite/1708525189002-CreateDigitalCredential.ts
index c036cf1d6..449f62243 100644
--- a/packages/data-store/src/migrations/sqlite/1708525189002-CreateDigitalCredential.ts
+++ b/packages/data-store/src/migrations/sqlite/1708525189002-CreateDigitalCredential.ts
@@ -12,7 +12,7 @@ export class CreateDigitalCredential1708525189002 implements MigrationInterface
                 "document_type" varchar CHECK( "document_type" IN ('VC', 'VP', 'C', 'P') ) NOT NULL,
                 "regulation_type" varchar CHECK( "regulation_type" IN ('PID', 'QEAA', 'EAA', 'NON_REGULATED') ) NOT NULL DEFAULT 'NON_REGULATED',
                 "document_format" varchar CHECK( "document_format" IN ('JSON_LD', 'JWT', 'SD_JWT', 'MSO_MDOC') ) NOT NULL,
-                "credential_role" varchar CHECK( "credential_role" IN ('ISSUER', 'VERIFIER', 'HOLDER', 'FEDERATION OPERATOR') ) NOT NULL,
+                "credential_role" varchar CHECK( "credential_role" IN ('ISSUER', 'VERIFIER', 'HOLDER', 'FEDERATION_TRUST_ANCHOR') ) NOT NULL,
                 "raw_document" text NOT NULL,
                 "uniform_document" text NOT NULL,
                 "credential_id" text,
diff --git a/packages/data-store/src/types/digitalCredential/digitalCredential.ts b/packages/data-store/src/types/digitalCredential/digitalCredential.ts
index 587a49bad..86ef610e5 100644
--- a/packages/data-store/src/types/digitalCredential/digitalCredential.ts
+++ b/packages/data-store/src/types/digitalCredential/digitalCredential.ts
@@ -93,7 +93,7 @@ export enum CredentialRole {
   ISSUER = 'ISSUER',
   VERIFIER = 'VERIFIER',
   HOLDER = 'HOLDER',
-  FEDERATION_OPERATOR = 'FEDERATION OPERATOR'
+  FEDERATION_TRUST_ANCHOR = 'FEDERATION_TRUST_ANCHOR'
 }
 
 export enum CredentialStateType {
diff --git a/packages/oid4vci-holder/package.json b/packages/oid4vci-holder/package.json
index 092009d9a..a65c952ad 100644
--- a/packages/oid4vci-holder/package.json
+++ b/packages/oid4vci-holder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.oid4vci-holder",
-  "version": "0.30.99-bram",
+  "version": "0.30.1",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/packages/oid4vci-holder/src/localization/translations/en.json b/packages/oid4vci-holder/src/localization/translations/en.json
index 49b513857..a5e6c4b95 100644
--- a/packages/oid4vci-holder/src/localization/translations/en.json
+++ b/packages/oid4vci-holder/src/localization/translations/en.json
@@ -8,5 +8,6 @@
   "oid4vci_machine_credential_selection_error_title": "Credential selection",
   "oid4vci_machine_initiation_error_title": "Initiate OID4VCI provider",
   "oid4vci_machine_credential_verification_failed_message": "The credential verification resulted in an error.",
-  "oid4vci_machine_credential_verification_schema_failed_message": "The credential schema verification resulted in an error."
+  "oid4vci_machine_credential_verification_schema_failed_message": "The credential schema verification resulted in an error.",
+  "oid4vci_machine_retrieve_federation_trust_error_title": "Retrieve federation trust"
 }
diff --git a/packages/oid4vci-holder/src/localization/translations/nl.json b/packages/oid4vci-holder/src/localization/translations/nl.json
index 6aa01575a..ee867dba1 100644
--- a/packages/oid4vci-holder/src/localization/translations/nl.json
+++ b/packages/oid4vci-holder/src/localization/translations/nl.json
@@ -7,5 +7,6 @@
   "oid4vci_machine_retrieve_contact_error_title": "Ophalen contact",
   "oid4vci_machine_credential_selection_error_title": "Credential selectie",
   "oid4vci_machine_initiation_error_title": "Initiëren OID4VCI provider",
-  "oid4vci_machine_credential_verification_failed_message": "Verificatie van de credential leidde tot een fout."
+  "oid4vci_machine_credential_verification_failed_message": "Verificatie van de credential leidde tot een fout.",
+  "oid4vci_machine_retrieve_federation_trust_error_title": "Ophalen federatievertrouwen"
 }
diff --git a/packages/oid4vci-holder/src/machine/oid4vciMachine.ts b/packages/oid4vci-holder/src/machine/oid4vciMachine.ts
index 72de7aeeb..3eeb11071 100644
--- a/packages/oid4vci-holder/src/machine/oid4vciMachine.ts
+++ b/packages/oid4vci-holder/src/machine/oid4vciMachine.ts
@@ -305,7 +305,7 @@ const createOID4VCIMachine = (opts?: CreateOID4VCIMachineOpts): OID4VCIStateMach
             target: OID4VCIMachineStates.handleError,
             actions: assign({
               error: (_ctx: OID4VCIMachineContext, _event: DoneInvokeEvent<Error>): ErrorDetails => ({
-                title: translate('oid4vci_machine_store_credential_error_title'), // TODO
+                title: translate('oid4vci_machine_retrieve_federation_trust_error_title'),
                 message: _event.data.message,
                 stack: _event.data.stack,
               }),