diff --git a/src/main/kotlin/org/eclipse/tractusx/managedidentitywallets/persistence/entities/CredentialDao.kt b/src/main/kotlin/org/eclipse/tractusx/managedidentitywallets/persistence/entities/CredentialDao.kt
index 8beb6edd7..12e7bd5aa 100644
--- a/src/main/kotlin/org/eclipse/tractusx/managedidentitywallets/persistence/entities/CredentialDao.kt
+++ b/src/main/kotlin/org/eclipse/tractusx/managedidentitywallets/persistence/entities/CredentialDao.kt
@@ -25,8 +25,8 @@ import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.dao.id.IntIdTable
 
 object VerifiableCredentials : IntIdTable("verifiable_credentials") {
-    val content = text("content").uniqueIndex("content")
-    val credentialId = varchar("credential_id", 4096).uniqueIndex("credentialId").nullable()
+    val content = text("content").uniqueIndex("content_IX")
+    val credentialId = varchar("credential_id", 4096).uniqueIndex("credential_id_IX").nullable()
     val issuerDid = varchar("issuer_did", 4096)
     val holderDid = varchar("holder_did", 4096)
     val type = varchar("type", 4096)
diff --git a/src/main/kotlin/org/eclipse/tractusx/managedidentitywallets/persistence/entities/KeyReferenceDao.kt b/src/main/kotlin/org/eclipse/tractusx/managedidentitywallets/persistence/entities/KeyReferenceDao.kt
index 414d5141c..48b29c54c 100644
--- a/src/main/kotlin/org/eclipse/tractusx/managedidentitywallets/persistence/entities/KeyReferenceDao.kt
+++ b/src/main/kotlin/org/eclipse/tractusx/managedidentitywallets/persistence/entities/KeyReferenceDao.kt
@@ -29,7 +29,7 @@ import org.jetbrains.exposed.sql.javatime.datetime
 object KeyReferences : IntIdTable("key_references") {
     val bpn = reference("bpn", Wallets.bpn)
     val vaultAccestoken = varchar("vault_accestoken", 4096)
-    val referenceKey = varchar("reference_key", 36).uniqueIndex("bpn")
+    val referenceKey = varchar("reference_key", 36).uniqueIndex("reference_key_IX")
     val createdAt = datetime("created_at").defaultExpression(CurrentDateTime)
     val modifiedAt = datetime("modified_at").defaultExpression(CurrentDateTime)
     val modifiedFrom = varchar("modified_from", 36)
diff --git a/src/main/kotlin/org/eclipse/tractusx/managedidentitywallets/persistence/entities/WalletDao.kt b/src/main/kotlin/org/eclipse/tractusx/managedidentitywallets/persistence/entities/WalletDao.kt
index c78ada872..7f6db5d46 100644
--- a/src/main/kotlin/org/eclipse/tractusx/managedidentitywallets/persistence/entities/WalletDao.kt
+++ b/src/main/kotlin/org/eclipse/tractusx/managedidentitywallets/persistence/entities/WalletDao.kt
@@ -32,8 +32,8 @@ object Wallets : IntIdTable("wallets") {
     val modifiedFrom = varchar("modified_from", 36)
 
     val name = varchar("name", 127)
-    var bpn = varchar("bpn", 36).uniqueIndex("bpn")
-    val did = varchar("did", 2096).uniqueIndex("did")
+    var bpn = varchar("bpn", 36).uniqueIndex("bpn_IX")
+    val did = varchar("did", 2096).uniqueIndex("did_IX")
     val didDocument = varchar("did_document", 4096)
 
     val active = bool("is_active").default(true)