diff --git a/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/JwtPresentationES256KService.java b/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/JwtPresentationES256KService.java
index 8a5905f11..790c7b4fe 100644
--- a/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/JwtPresentationES256KService.java
+++ b/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/JwtPresentationES256KService.java
@@ -109,17 +109,18 @@ public SignedJWT createPresentation(Did issuer, List<VerifiableCredential> crede
     public void storeWalletKeyES256K(Wallet wallet) {
         WalletKey walletKeyES256K;
         try {
+            String keyId = UUID.randomUUID().toString();
             // create additional key pair ES256K
             ECKey ecJwk = new ECKeyGenerator(Curve.SECP256K1)
                     .keyUse(KeyUse.SIGNATURE)
-                    .keyID(UUID.randomUUID().toString())
+                    .keyID(keyId)
                     .provider(BouncyCastleProviderSingleton.getInstance())
                     .generate();
 
             Wallet walletFromDB = walletRepository.getByDid(wallet.getDid());
             walletKeyES256K = WalletKey.builder()
                     .wallet(walletFromDB)
-                    .keyId(UUID.randomUUID().toString())
+                    .keyId(keyId)
                     .referenceKey("dummy ref key, removed once vault setup is ready")
                     .vaultAccessToken("dummy vault access token, removed once vault setup is ready")
                     .privateKey(encryptionUtils.encrypt(getPrivateKeyString(ecJwk.toECPrivateKey().getEncoded())))
diff --git a/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/WalletService.java b/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/WalletService.java
index 3766505e9..0c6921089 100644
--- a/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/WalletService.java
+++ b/src/main/java/org/eclipse/tractusx/managedidentitywallets/service/WalletService.java
@@ -280,7 +280,7 @@ private Wallet createWallet(CreateWalletRequest request, boolean authority, Stri
 
         WalletKey walletKeyED25519 = WalletKey.builder()
                 .wallet(wallet)
-                .keyId(UUID.randomUUID().toString())
+                .keyId(keyId)
                 .referenceKey("dummy ref key, removed once vault setup is ready")
                 .vaultAccessToken("dummy vault access token, removed once vault setup is ready")
                 .privateKey(encryptionUtils.encrypt(getPrivateKeyString(keyPair.getPrivateKey().asByte())))