diff --git a/.dev/compose.openid4vc.yml b/.dev/compose.openid4vc.yml
index cfa5b1378..d01184ea3 100644
--- a/.dev/compose.openid4vc.yml
+++ b/.dev/compose.openid4vc.yml
@@ -46,19 +46,21 @@ services:
       - default
 
   eudiplo:
-    image: ghcr.io/openwallet-foundation-labs/eudiplo:1.16.0
+    image: ghcr.io/openwallet-foundation-labs/eudiplo:3.1.2@sha256:0ea3a73d42a1eb10a6edc45e3289478b08b09064bd75563c503ed12be2ed2dc6
     environment:
       - PUBLIC_URL=http://localhost:3000
-      - JWT_SECRET="OgwrDcgVQQ2yZwcFt7kPxQm3nUF+X3etF6MdLTstZAY="
+      - MASTER_SECRET="OgwrDcgVQQ2yZwcFt7kPxQm3nUF+X3etF6MdLTstZAY="
       - AUTH_CLIENT_ID="root"
       - AUTH_CLIENT_SECRET="test"
+      - CONFIG_IMPORT=true
+      - CONFIG_FOLDER=/app/assets/config
       - PORT=3000
     extra_hosts:
       - "host.docker.internal:host-gateway"
     ports:
       - "3000:3000"
     volumes:
-      - ./eudiplo-assets:/app/config
+      - ./eudiplo-assets:/app/assets/config
 
 networks:
   default:
diff --git a/.dev/eudiplo-assets/service.db b/.dev/eudiplo-assets/service.db
deleted file mode 100644
index 9255f0bdb..000000000
Binary files a/.dev/eudiplo-assets/service.db and /dev/null differ
diff --git a/.dev/eudiplo-assets/test/certs/certificate.json b/.dev/eudiplo-assets/test/certs/certificate.json
new file mode 100644
index 000000000..443fbfb67
--- /dev/null
+++ b/.dev/eudiplo-assets/test/certs/certificate.json
@@ -0,0 +1,8 @@
+{
+    "id": "f712261e-70aa-459d-af79-330c86bd0711",
+    "keyId": "c02bae13-e5a5-42fd-94bd-c6999f5e4b46",
+    "certUsageTypes": ["access", "signing", "statusList", "trustList"],
+    "crt": [
+        "-----BEGIN CERTIFICATE-----\nMIIBfzCCASWgAwIBAgIBATAKBggqhkjOPQQDAjAcMQswCQYDVQQGEwJERTENMAsG\nA1UEAxMEdGVzdDAeFw0yNjAzMDUxMTAxNTFaFw0yNzAzMDUxMTAxNTFaMBwxCzAJ\nBgNVBAYTAkRFMQ0wCwYDVQQDEwR0ZXN0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD\nQgAEdii3YD7um3gFaw2Rn/AD6g3SrxWGFAQNGjt74wUnCICKK0s6YGROFvybMhny\ncNfDg/n+egSxIemz9CT2OXeNf6NYMFYwFAYDVR0RBA0wC4IJbG9jYWxob3N0MA8G\nA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgKkMB0GA1UdDgQWBBQVPwb+HICl\n8AffEMHThMfTnRMljjAKBggqhkjOPQQDAgNIADBFAiEA0sP71bWw8XM9ts6EOoIH\nOBoUxWmDlqUGWDHjtH57KG0CIFMMlAGG4IqrZ1CJF1BuyhVU3ZEg4rMZp3GvX06K\nuR8r\n-----END CERTIFICATE-----"
+    ]
+}
diff --git a/.dev/eudiplo-assets/test/clients/test-admin.json b/.dev/eudiplo-assets/test/clients/test-admin.json
new file mode 100644
index 000000000..88417327f
--- /dev/null
+++ b/.dev/eudiplo-assets/test/clients/test-admin.json
@@ -0,0 +1,5 @@
+{
+    "clientId": "test-admin",
+    "secret": "57c9cd444bf402b2cc1f5a0d2dafd3955bd9042c0372db17a4ede2d5fbda88e5",
+    "roles": ["clients:manage", "issuance:manage", "issuance:offer", "presentation:manage", "presentation:request"]
+}
diff --git a/.dev/eudiplo-assets/uploads/f5ccdd18-0f42-472d-a2c9-902d3b69ecae b/.dev/eudiplo-assets/test/images/logo.png
similarity index 100%
rename from .dev/eudiplo-assets/uploads/f5ccdd18-0f42-472d-a2c9-902d3b69ecae
rename to .dev/eudiplo-assets/test/images/logo.png
diff --git a/.dev/eudiplo-assets/test/info.json b/.dev/eudiplo-assets/test/info.json
new file mode 100644
index 000000000..22e908c4a
--- /dev/null
+++ b/.dev/eudiplo-assets/test/info.json
@@ -0,0 +1,4 @@
+{
+    "name": "test",
+    "description": "test tenant"
+}
diff --git a/.dev/eudiplo-assets/test/issuance/credentials/test.json b/.dev/eudiplo-assets/test/issuance/credentials/test.json
new file mode 100644
index 000000000..a5912abf0
--- /dev/null
+++ b/.dev/eudiplo-assets/test/issuance/credentials/test.json
@@ -0,0 +1,22 @@
+{
+    "id": "test",
+    "description": "test",
+    "config": {
+        "format": "dc+sd-jwt",
+        "display": [
+            {
+                "name": "test",
+                "description": "test",
+                "locale": "en-US",
+                "background_color": "#FFFFFF",
+                "text_color": "#000000",
+                "logo": { "uri": "logo.png" }
+            }
+        ]
+    },
+    "disclosureFrame": { "_sd": ["givenName"] },
+    "vct": "test",
+    "keyBinding": true,
+    "statusManagement": false,
+    "lifeTime": 3600
+}
diff --git a/.dev/eudiplo-assets/test/issuance/issuance.json b/.dev/eudiplo-assets/test/issuance/issuance.json
new file mode 100644
index 000000000..5e34f49a7
--- /dev/null
+++ b/.dev/eudiplo-assets/test/issuance/issuance.json
@@ -0,0 +1,13 @@
+{
+    "authServers": ["https://kc-openid4vc.is.enmeshed.eu/realms/enmeshed-openid4vci"],
+    "batchSize": 1,
+    "dPopRequired": false,
+    "display": [
+        {
+            "name": "test",
+            "locale": "en-US",
+            "logo": { "uri": "logo.png" }
+        }
+    ],
+    "walletAttestationRequired": false
+}
diff --git a/.dev/eudiplo-assets/test/keys/key.json b/.dev/eudiplo-assets/test/keys/key.json
new file mode 100644
index 000000000..c04336a59
--- /dev/null
+++ b/.dev/eudiplo-assets/test/keys/key.json
@@ -0,0 +1,11 @@
+{
+    "id": "c02bae13-e5a5-42fd-94bd-c6999f5e4b46",
+    "key": {
+        "kty": "EC",
+        "x": "dii3YD7um3gFaw2Rn_AD6g3SrxWGFAQNGjt74wUnCIA",
+        "y": "iitLOmBkThb8mzIZ8nDXw4P5_noEsSHps_Qk9jl3jX8",
+        "crv": "P-256",
+        "d": "h_05VoTTqPlQsox6BHDwScXhD61ZoYWGD1Gpirk06N8",
+        "alg": "ES256"
+    }
+}
diff --git a/.dev/eudiplo-assets/test/presentation/test.json b/.dev/eudiplo-assets/test/presentation/test.json
new file mode 100644
index 000000000..f4f16ee72
--- /dev/null
+++ b/.dev/eudiplo-assets/test/presentation/test.json
@@ -0,0 +1,15 @@
+{
+    "id": "test",
+    "description": "test",
+    "dcql_query": {
+        "credentials": [
+            {
+                "id": "test",
+                "format": "dc+sd-jwt",
+                "meta": { "vct_values": ["test"] }
+            }
+        ]
+    },
+    "accessCertId": "f712261e-70aa-459d-af79-330c86bd0711",
+    "lifeTime": 300
+}