diff --git a/backend/business-partner-agent/pom.xml b/backend/business-partner-agent/pom.xml
index eb6a1907c..209c6eb31 100644
--- a/backend/business-partner-agent/pom.xml
+++ b/backend/business-partner-agent/pom.xml
@@ -155,7 +155,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-crypto</artifactId>
-            <version>5.6.1</version>
+            <version>5.6.2</version>
         </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
@@ -170,7 +170,7 @@
         <dependency>
             <groupId>io.micronaut.email</groupId>
             <artifactId>micronaut-email-mailjet</artifactId>
-            <version>1.0.1</version>
+            <version>1.1.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.activation</groupId>
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/api/PartnerAPI.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/api/PartnerAPI.java
index b265db5ef..9a824f76a 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/api/PartnerAPI.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/api/PartnerAPI.java
@@ -112,7 +112,7 @@ public static void copyFrom(@NonNull PartnerAPI to, @NonNull Partner from) {
      * 2. Legal Name from public profile if set 3. aca-py label, --label flag or
      * overwritten when creating the connection with the label option 4. did, public
      * or peer
-     * 
+     *
      * @return the partners name or null if no match was found
      */
     public String getName() {
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/client/LedgerExplorerClient.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/client/LedgerExplorerClient.java
index 0b7f12f7e..1724b42f9 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/client/LedgerExplorerClient.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/client/LedgerExplorerClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020-2021 - for information on the respective copyright owner
+ * Copyright (c) 2020-2022 - for information on the respective copyright owner
  * see the NOTICE file and/or the repository at
  * https://github.com/hyperledger-labs/business-partner-agent
  *
@@ -76,7 +76,7 @@ public class LedgerExplorerClient {
     /**
      * Query the ledger explorer for a list of credential definitions that are based
      * on a did or a TRX id.
-     * 
+     *
      * @param query query can be either a did or a transaction id.
      * @return optional list of {@link PartnerCredentialType}
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/AdminController.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/AdminController.java
index 1a0a3a1c0..1857721a0 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/AdminController.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/AdminController.java
@@ -273,7 +273,7 @@ public HttpResponse<RuntimeConfig> getRuntimeConfig() {
      * Trigger the backend to write configured endpoints to the ledger. TAA digest
      * has to be passed to explicitly confirm prior TTA acceptance by the user for
      * this ledger interaction / session.
-     * 
+     *
      * @param tAADigest {@link TAADigestRequest}
      * @return {@link HttpResponse}
      */
@@ -299,7 +299,7 @@ public HttpResponse<Boolean> isEndpointsWriteRequired() {
 
     /**
      * Get TAA record (digest, text, version)
-     * 
+     *
      * @return {@link TAARecord}
      */
     @Get("/taa/get")
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/InvitationController.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/InvitationController.java
index ea80ae73e..9a6df5416 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/InvitationController.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/InvitationController.java
@@ -49,7 +49,7 @@ public class InvitationController {
 
     /**
      * Check invitation (receive)
-     * 
+     *
      * @param body {@link CheckInvitationRequest}
      * @return {@link MutableHttpResponse}
      */
@@ -60,7 +60,7 @@ public MutableHttpResponse<Object> checkInvitation(@Body CheckInvitationRequest
 
     /**
      * Receive / accept invitation
-     * 
+     *
      * @param body {@link AcceptInvitationRequest}
      * @return {@link MutableHttpResponse}
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/IssuerController.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/IssuerController.java
index db7117134..26b4cd65e 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/IssuerController.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/IssuerController.java
@@ -128,7 +128,7 @@ public HttpResponse<String> issueCredential(@Valid @Body IssueCredentialRequest
     /**
      * Issue OOB credential step 1 - prepares credential offer and returns URL for
      * use within the barcode
-     * 
+     *
      * @param req {@link IssueOOBCredentialRequest}
      * @return {@link APICreateInvitationResponse}
      */
@@ -140,7 +140,7 @@ public HttpResponse<APICreateInvitationResponse> issueCredentialConnectionLess(
 
     /**
      * Issue OOB credential step 2 - redirect with encoded offer
-     * 
+     *
      * @param id {@link UUID}
      * @return Redirect with encoded credential offer in the location header
      */
@@ -188,7 +188,7 @@ public HttpResponse<CredEx> revokeCredential(@PathVariable UUID id) {
     /**
      * Send holder a new credential offer based on an existing (revoked) exchange
      * record
-     * 
+     *
      * @param id credential exchange id
      * @return {@link HttpResponse}
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/MessagingController.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/MessagingController.java
index e32f906e8..2cbb50500 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/MessagingController.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/MessagingController.java
@@ -52,7 +52,7 @@ public class MessagingController {
 
     /**
      * List message templates
-     * 
+     *
      * @return list of {@link MessageTemplateCmd.ApiMessageTemplate}
      */
     @Get("/template")
@@ -62,7 +62,7 @@ public HttpResponse<List<MessageTemplateCmd.ApiMessageTemplate>> listMessageTemp
 
     /**
      * Add new message template
-     * 
+     *
      * @param template {@link MessageTemplateCmd.MessageTemplateRequest}
      * @return {@link MessageTemplateCmd.ApiMessageTemplate}
      */
@@ -74,7 +74,7 @@ public HttpResponse<MessageTemplateCmd.ApiMessageTemplate> addMessageTemplate(
 
     /**
      * Update message template
-     * 
+     *
      * @param id       {@link UUID} template id
      * @param template {@link MessageTemplateCmd.MessageTemplateRequest}
      * @return HTTP status
@@ -88,7 +88,7 @@ public HttpResponse<Void> updateMessageTemplate(@PathVariable UUID id,
 
     /**
      * Delete message template
-     * 
+     *
      * @param id {@link UUID} template id
      * @return HTTP status
      */
@@ -102,7 +102,7 @@ public HttpResponse<Void> deleteMessageTemplate(@PathVariable UUID id) {
 
     /**
      * List user info
-     * 
+     *
      * @return list of {@link MessageUserInfoCmd.ApiUserInfo}
      */
     @Get("/user-info")
@@ -112,7 +112,7 @@ public HttpResponse<List<MessageUserInfoCmd.ApiUserInfo>> listUserInfo() {
 
     /**
      * Add new user info configuration
-     * 
+     *
      * @param config {@link MessageUserInfoCmd.UserInfoRequest}
      * @return {@link MessageUserInfoCmd.ApiUserInfo}
      */
@@ -124,7 +124,7 @@ public HttpResponse<MessageUserInfoCmd.ApiUserInfo> addUserInfo(
 
     /**
      * Update user info configuration
-     * 
+     *
      * @param id     {@link UUID} user info id
      * @param config {@link MessageUserInfoCmd.UserInfoRequest}
      * @return HTTP status
@@ -138,7 +138,7 @@ public HttpResponse<Void> updateUserInfo(@PathVariable UUID id,
 
     /**
      * Delete user info configuration
-     * 
+     *
      * @param id {@link UUID} user info id
      * @return HTTP status
      */
@@ -152,7 +152,7 @@ public HttpResponse<Void> deleteUserInfo(@PathVariable UUID id) {
 
     /**
      * List message trigger configuration
-     * 
+     *
      * @return list of {@link MessageTriggerConfigCmd.ApiTriggerConfig}
      */
     @Get("/trigger")
@@ -162,7 +162,7 @@ public HttpResponse<List<MessageTriggerConfigCmd.ApiTriggerConfig>> listMessageT
 
     /**
      * ASdd new message trigger configuration
-     * 
+     *
      * @param trigger {@link MessageTriggerConfigCmd.ApiTriggerConfig}
      * @return {@link MessageTriggerConfigCmd.TriggerConfigRequest}
      */
@@ -175,7 +175,7 @@ public HttpResponse<MessageTriggerConfigCmd.ApiTriggerConfig> addMessageTrigger(
 
     /**
      * Update message trigger configuration
-     * 
+     *
      * @param id      {@link UUID} message trigger id
      * @param trigger {@link MessageTriggerConfigCmd.TriggerConfigRequest}
      * @return HTTP status
@@ -190,7 +190,7 @@ public HttpResponse<Void> updateMessageTrigger(@PathVariable UUID id,
 
     /**
      * Delete message trigger configuration
-     * 
+     *
      * @param id {@link UUID} message trigger id
      * @return HTTP status
      */
@@ -204,7 +204,7 @@ public HttpResponse<Void> deleteMessageTrigger(@PathVariable UUID id) {
 
     /**
      * Manual trigger to send an invitation url by email
-     * 
+     *
      * @param request {@link AdHocMessageRequest}
      * @return HTTP status
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/ProofTemplateController.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/ProofTemplateController.java
index 1bb3b0d93..8c45f3d5b 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/ProofTemplateController.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/controller/ProofTemplateController.java
@@ -50,7 +50,7 @@ public class ProofTemplateController {
 
     /**
      * List configured templates
-     * 
+     *
      * @return list of {@link ProofTemplate}
      */
     @Get
@@ -63,7 +63,7 @@ public HttpResponse<List<ProofTemplate>> listProofTemplates() {
 
     /**
      * Get template by id
-     * 
+     *
      * @param id proof template id
      * @return {@link ProofTemplate}
      */
@@ -79,7 +79,7 @@ public HttpResponse<ProofTemplate> getProofTemplateForId(@PathVariable UUID id)
 
     /**
      * Add a new proof template
-     * 
+     *
      * @param template {@link ProofTemplate}
      * @return {@link ProofTemplate}
      */
@@ -109,7 +109,7 @@ public HttpResponse<Set<String>> listKnownConditionOperators() {
 
     /**
      * Delete proof template by id
-     * 
+     *
      * @param id proof template id
      * @return Http Status
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/activity/DidResolver.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/activity/DidResolver.java
index 51730da88..f2a25c327 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/activity/DidResolver.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/activity/DidResolver.java
@@ -68,7 +68,7 @@ public class DidResolver {
     /**
      * Tries to resolve the partners public profile based on the did contained
      * within a commercial register credential.
-     * 
+     *
      * @param pp {@link PartnerProof}
      */
     @Async
@@ -115,7 +115,7 @@ public void resolveDid(PartnerProof pp, @NonNull List<PresentationExchangeRecord
      * did can be resolved to a profile, if this is not possible try to do this
      * based on a did that is embedded in the partners label. The label is supposed
      * to adhere to the following format: did:sov:xxx:123:MyLabel
-     * 
+     *
      * @param p {@link Partner}
      */
     @Async
@@ -158,7 +158,7 @@ private Optional<PartnerAPI> lookupPartnerSave(String did) {
     /**
      * Extracts the did and label components from a label is supposed to adhere to
      * the following format: did:sov:123:MyLabel.
-     * 
+     *
      * @param label the label
      * @return {@link ConnectionLabel}
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/activity/PartnerCredDefLookup.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/activity/PartnerCredDefLookup.java
index d5ff9a89f..010b08298 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/activity/PartnerCredDefLookup.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/activity/PartnerCredDefLookup.java
@@ -67,7 +67,7 @@ public class PartnerCredDefLookup {
     /**
      * Get/filter partners that can issue credentials that are based on the schema's
      * id.
-     * 
+     *
      * @param schemaId the schema id
      * @return {@link PartnerAPI} list
      */
@@ -82,7 +82,7 @@ public List<PartnerAPI> getIssuersFor(@NonNull String schemaId) {
     /**
      * If a ledger explorer is configured. Find partners that can issue credentials
      * that are based on the schema id.
-     * 
+     *
      * @param schemaId the schema id
      * @param result   {@link List} that should contain the result
      */
@@ -104,7 +104,7 @@ void filterBySupportedCredential(String schemaId, List<PartnerAPI> result) {
      * If NO ledger explorer is configured, statically match configured issuer did's
      * to partner did's to find partners that can issue a credential based on the
      * schema id.
-     * 
+     *
      * @param schemaId the schema id
      * @param result   {@link List} that should contain the result
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/connection/InvitationParser.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/connection/InvitationParser.java
index 741e00011..317998ce4 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/connection/InvitationParser.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/connection/InvitationParser.java
@@ -243,7 +243,7 @@ private String parseInvitationBlockFromRedirect(@NonNull HttpUrl url) {
      * we are only interested in the query so the result is wrapped for easier
      * parsing. In case of an url we simply convert to maintain the original
      * location.
-     * 
+     *
      * @param invitationUri uri as String
      * @param decode        if the invitationUri needs url decoding
      * @return {@link HttpUrl} or null
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/CredentialManagerBase.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/CredentialManagerBase.java
index b3f780ddb..31b811a0f 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/CredentialManagerBase.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/CredentialManagerBase.java
@@ -66,7 +66,7 @@ public abstract class CredentialManagerBase {
      * If there is a problem during the credential exchange and aca-py is started
      * without the option to preserve exchange records, the record is deleted
      * immediately. Hence, we need to check if the record exists in both systems.
-     * 
+     *
      * @param id credential exchange id
      * @return {@link BPACredentialExchange}
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/HolderManager.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/HolderManager.java
index 0f426e5e4..eebaef731 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/HolderManager.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/HolderManager.java
@@ -109,7 +109,7 @@ public class HolderManager extends CredentialManagerBase {
 
     /**
      * Request credential from issuer (partner)
-     * 
+     *
      * @param partnerId {@link UUID}
      * @param myDocId   {@link UUID}
      * @param version   {@link ExchangeVersion}
@@ -150,7 +150,7 @@ public void sendCredentialProposal(@NonNull UUID partnerId, @NonNull UUID myDocI
 
     /**
      * Holder accepts credential offer received from issuer
-     * 
+     *
      * @param id {@link UUID} bpa credential exchange id
      */
     public void sendCredentialRequest(@NonNull UUID id) {
@@ -173,7 +173,7 @@ public void sendCredentialRequest(@NonNull UUID id) {
 
     /**
      * Holder declines credential offer received from issuer
-     * 
+     *
      * @param id      {@link UUID} bpa credential exchange id
      * @param message optional reason
      */
@@ -189,7 +189,7 @@ public void declineCredentialOffer(@NonNull UUID id, @Nullable String message) {
 
     /**
      * Sets the credential's visibility in the public profile
-     * 
+     *
      * @param id {@link UUID} bpa credential exchange id
      */
     public void toggleVisibility(UUID id) {
@@ -221,7 +221,7 @@ public List<AriesCredential> listHeldCredentials(@Nullable List<CredentialType>
 
     /**
      * Find wallet credential by id
-     * 
+     *
      * @param id {@link UUID} bpa credential exchange id
      * @return {@link AriesCredential}
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/IssuerManager.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/IssuerManager.java
index 1b0d36dbf..f9441a877 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/IssuerManager.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/IssuerManager.java
@@ -118,7 +118,7 @@ public String issueCredential(@NonNull IssueCredentialRequest request) {
 
     /**
      * Re-issue a revoked credential, only works for indy credentials
-     * 
+     *
      * @param exchangeId bpa credential exchange id
      */
     public void reIssueCredential(@NonNull UUID exchangeId) {
@@ -134,7 +134,7 @@ public void reIssueCredential(@NonNull UUID exchangeId) {
      * Revocation only works for indy credentials. Json-ld credentials are currently
      * (February '22) not revocable, there is an ongoing discussion to use:
      * https://w3c-ccg.github.io/vc-status-rl-2020/ for this.
-     * 
+     *
      * @param id bpa credential exchange id.
      * @return {@link CredEx}
      */
@@ -191,7 +191,7 @@ public CredEx sendCredentialOffer(@NonNull UUID id, @NonNull CredentialOfferRequ
 
     /**
      * Issuer declines credential proposal received from holder
-     * 
+     *
      * @param id      {@link UUID} bpa credential exchange id
      * @param message optional reason
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/OOBCredentialOffer.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/OOBCredentialOffer.java
index 3dfeb302d..3a508bcc5 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/OOBCredentialOffer.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/credential/OOBCredentialOffer.java
@@ -26,6 +26,7 @@
 import org.hyperledger.acy_py.generated.model.InvitationRecord;
 import org.hyperledger.aries.AriesClient;
 import org.hyperledger.aries.api.connection.ConnectionState;
+import org.hyperledger.aries.api.credentials.Credential;
 import org.hyperledger.aries.api.issue_credential_v1.CredentialExchangeRole;
 import org.hyperledger.aries.api.issue_credential_v1.CredentialExchangeState;
 import org.hyperledger.aries.api.issue_credential_v1.V1CredentialFreeOfferHelper;
@@ -97,7 +98,7 @@ public OOBCredentialOffer(AriesClient ac) {
 
     /**
      * Step 1: Prepare offer und return URL
-     * 
+     *
      * @param req {@link IssueOOBCredentialRequest}
      * @return location of the offer
      */
@@ -116,7 +117,7 @@ public APICreateInvitationResponse issueConnectionLess(@NonNull IssueOOBCredenti
         log.debug("{}", GsonConfig.defaultNoEscaping().toJson(freeOffer));
 
         Partner p = persistPartner(freeOffer.getInvitationRecord(), req.getAlias(), req.getTrustPing(), req.getTag());
-        persistCredentialExchange(freeOffer, dbCredDef, p);
+        persistCredentialExchange(freeOffer, document, dbCredDef, p);
 
         return APICreateInvitationResponse.builder()
                 .invitationUrl(
@@ -129,7 +130,7 @@ public APICreateInvitationResponse issueConnectionLess(@NonNull IssueOOBCredenti
 
     /**
      * Step 2: Return the base64 encoded invitation plus attachment
-     * 
+     *
      * @param invMessageId invitation message id
      * @return base64 encoded invitation URL
      */
@@ -149,7 +150,9 @@ public String handleConnectionLess(@NonNull UUID invMessageId) {
     }
 
     private void persistCredentialExchange(
-            @NonNull V1CredentialFreeOfferHelper.CredentialFreeOffer r, @NonNull BPACredentialDefinition dbCredDef,
+            @NonNull V1CredentialFreeOfferHelper.CredentialFreeOffer r,
+            @NonNull Map<String, String> document,
+            @NonNull BPACredentialDefinition dbCredDef,
             @NonNull Partner p) {
         BPACredentialExchange.BPACredentialExchangeBuilder b = BPACredentialExchange
                 .builder()
@@ -164,7 +167,10 @@ private void persistCredentialExchange(
                 .credentialOffer(r.getCredentialProposalDict() != null
                         ? BPACredentialExchange.ExchangePayload
                                 .indy(r.getCredentialProposalDict().getCredentialProposal())
-                        : null);
+                        : null)
+                .indyCredential(Credential.builder()
+                        .attrs(document)
+                        .build());
         credExRepo.save(b.build());
     }
 
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/jsonld/LDContextHelper.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/jsonld/LDContextHelper.java
index 171625e40..03f249873 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/jsonld/LDContextHelper.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/jsonld/LDContextHelper.java
@@ -105,7 +105,7 @@ public V2CredentialExchangeFree.V20CredFilter buildVC(
      * back to the holders local did:key which will then be replaced by the issuer
      * with the issuers key. Note: This will work, but in this case the issuer is
      * not verified.
-     * 
+     *
      * @param bpaSchema {@link BPASchema}
      * @return did:key
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/prooftemplates/ProofTemplateElementVisitor.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/prooftemplates/ProofTemplateElementVisitor.java
index 5bb675f6e..8175d0701 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/prooftemplates/ProofTemplateElementVisitor.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/prooftemplates/ProofTemplateElementVisitor.java
@@ -94,7 +94,7 @@ private AtomicInteger getSameSchemaCounter(Pair<String, ?> schemaAndAttributesBu
     /**
      * Collects general information of the given {@link BPAProofTemplate}, e.g. the
      * template's name.
-     * 
+     *
      * @param bpaProofTemplate contains general information to create a
      *                         {@link PresentProofRequest.ProofRequest}.
      */
@@ -104,7 +104,7 @@ void visit(BPAProofTemplate bpaProofTemplate) {
 
     /**
      * Collects the information of the given {@link BPAAttributeGroup}
-     * 
+     *
      * @param bpaAttributeGroup contains all information for a
      *                          {@link PresentProofRequest.ProofRequest} related to
      *                          a certain schema.
@@ -122,7 +122,7 @@ void visit(BPAAttributeGroup bpaAttributeGroup) {
     /**
      * Collects the information of the given {@link BPAAttribute} in context of its
      * {@link BPAAttributeGroup}'s <code>schemaId</code>
-     * 
+     *
      * @param schemaIdAndBpaAttribute is the <code>schemaId</code> of the
      *                                {@link BPAAttributeGroup} containing
      *                                {@link BPAAttribute}
@@ -285,7 +285,7 @@ private boolean shouldAddAsPredicate(BPAAttribute attribute) {
     /**
      * Creates a {@link PresentProofRequest.ProofRequest} with the information
      * collected by the <code>visit</code> methods.
-     * 
+     *
      * @return an applicable {@link PresentProofRequest.ProofRequest}
      */
     PresentProofRequest.ProofRequest getResult() {
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/schema/RestrictionsManager.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/schema/RestrictionsManager.java
index a28ddf8ed..8d96f79ca 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/schema/RestrictionsManager.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/aries/schema/RestrictionsManager.java
@@ -147,7 +147,7 @@ public String prefixIssuerDid(@NonNull String issuerDid) {
 
     /**
      * Resolve the label of the trusted issuer either by did or credDefId
-     * 
+     *
      * @param expression either did (qualified or unqualified) or credential
      *                   definition id
      * @return label of the trusted issuer if set
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/messaging/email/DefaultEmailService.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/messaging/email/DefaultEmailService.java
index 36e2bd411..3e94594ff 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/messaging/email/DefaultEmailService.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/messaging/email/DefaultEmailService.java
@@ -64,31 +64,31 @@ public void send(@NonNull @Valid EmailCmd cmd) {
      * mail.smtp.auth: true mail.smtp.starttls.enable: true
      * mail.smtp.connectiontimeout: 5000 mail.smtp.timeout: 5000
      * mail.smtp.writetimeout: 5000
-     * 
-     * 
+     *
+     *
      * @Singleton
-     * 
+     *
      * @Requires(notEnv = Environment.TEST)
-     * 
+     *
      * @Requires(property = "mail.username")
-     * 
+     *
      * @Requires(property = "mail.password") public static class
      * JavaMailSessionProvider implements SessionProvider {
-     * 
+     *
      * @Value("${mail.username}") String mailUser;
-     * 
+     *
      * @Value("${mail.password}") String mailPassword;
-     * 
+     *
      * private final Properties properties;
-     * 
+     *
      * JavaMailSessionProvider(MailPropertiesProvider mailPropertiesProvider) {
      * this.properties = mailPropertiesProvider.mailProperties(); }
-     * 
+     *
      * @Override
-     * 
+     *
      * @NonNull public Session session() { return Session.getInstance(properties,
      * new Authenticator() {
-     * 
+     *
      * @Override protected PasswordAuthentication getPasswordAuthentication() {
      * return new PasswordAuthentication(mailUser, mailPassword); } }); } }
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/util/AriesStringUtil.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/util/AriesStringUtil.java
index 9d0f3f6c4..60705ab89 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/util/AriesStringUtil.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/util/AriesStringUtil.java
@@ -36,7 +36,7 @@ public class AriesStringUtil {
 
     /**
      * Tests if the provided did is a did:key
-     * 
+     *
      * @param did
      * @return true if did is a did:key, false otherwise
      */
@@ -65,7 +65,7 @@ public static boolean isDidIndy(@Nullable String did) {
     /**
      * Checks if the provided did is fully qualified, if not it is prepended with
      * the provided qualifier
-     * 
+     *
      * @param did       qualified or unqualified did
      * @param qualifier fallback qualifier if the provided did is unqualified
      * @return qualified did
@@ -79,7 +79,7 @@ public static String qualifyDidIfNeeded(@Nullable String did, @NonNull String qu
 
     /**
      * Gets the last segment of a did
-     * 
+     *
      * @param did String e.g. did or credential definition id
      * @return the last part of the input when separated by : unchanged otherwise
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/util/Converter.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/util/Converter.java
index e6627ea64..7e1721d96 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/util/Converter.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/util/Converter.java
@@ -282,7 +282,7 @@ public Map<String, Object> revealedAttrsToGroup(Map<String, PresentationExchange
      * always falls back to 'proof-request' for the name. In most cases this is only
      * relevant in bpa to bpa communication, so we know how the proposal looks like,
      * and we can fall back to the label of the credential definition.
-     * 
+     *
      * @param p {@link PartnerProof}
      * @return name, credential definition tag, or default label
      */
diff --git a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/persistence/repository/DidDocWebRepository.java b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/persistence/repository/DidDocWebRepository.java
index d92f124af..a9f7f5b8c 100644
--- a/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/persistence/repository/DidDocWebRepository.java
+++ b/backend/business-partner-agent/src/main/java/org/hyperledger/bpa/persistence/repository/DidDocWebRepository.java
@@ -37,7 +37,7 @@ public interface DidDocWebRepository extends CrudRepository<DidDocWeb, UUID> {
 
     /**
      * Like with the highlander there can only be one.
-     * 
+     *
      * @return {@link DidDocWeb}
      */
     default Optional<DidDocWeb> findDidDocSingle() {
diff --git a/backend/pom.xml b/backend/pom.xml
index eaa25488e..97cb65304 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -56,19 +56,19 @@
         <log4j2.version>2.17.2</log4j2.version>
         <lombok.version>1.18.22</lombok.version>
         <lombok.maven.plugin.version>1.18.20.0</lombok.maven.plugin.version>
-        <micronaut.version>3.3.3</micronaut.version>
+        <micronaut.version>3.3.4</micronaut.version>
         <micronaut.data.version>3.2.2</micronaut.data.version>
         <micronaut.openapi.version>4.0.0</micronaut.openapi.version>
-        <micronaut.security.version>3.3.0</micronaut.security.version>
-        <mockito.version>4.3.1</mockito.version>
+        <micronaut.security.version>3.5.0</micronaut.security.version>
+        <mockito.version>4.4.0</mockito.version>
         <okhttp.version>4.9.3</okhttp.version>
         <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
         <pmd.version>6.43.0</pmd.version>
-        <spotbugs.version>4.5.3</spotbugs.version>
+        <spotbugs.version>4.6.0</spotbugs.version>
         <testcontainers.version>1.16.3</testcontainers.version>
         <!-- Plugin Versions -->
         <license-maven-plugin.version>4.1</license-maven-plugin.version>
-        <maven.compiler.plugin.version>3.10.0</maven.compiler.plugin.version>
+        <maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
         <maven.failsafe.plugin.version>3.0.0-M5</maven.failsafe.plugin.version>
         <maven.pmd.plugin.version>3.16.0</maven.pmd.plugin.version>
         <maven.spotbugs.plugin.version>4.5.3.0</maven.spotbugs.plugin.version>
@@ -135,7 +135,7 @@
             <dependency>
                 <groupId>org.flywaydb</groupId>
                 <artifactId>flyway-core</artifactId>
-                <version>8.5.1</version>
+                <version>8.5.2</version>
             </dependency>
             <!-- Logging -->
             <dependency>
@@ -249,7 +249,7 @@
             <plugin>
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
-                <version>6.5.3</version>
+                <version>7.0.0</version>
                 <configuration>
                     <failBuildOnAnyVulnerability>false</failBuildOnAnyVulnerability>
                     <skip>true</skip>
@@ -266,7 +266,7 @@
             <plugin>
                 <groupId>net.revelc.code.formatter</groupId>
                 <artifactId>formatter-maven-plugin</artifactId>
-                <version>2.17.1</version>
+                <version>2.18.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -341,7 +341,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.10.0</version>
+                    <version>3.11.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>