diff --git a/mercury/mercury-library/protocol-issue-credential/src/main/scala/io/iohk/atala/mercury/protocol/issuecredential/IssueFormats.scala b/mercury/mercury-library/protocol-issue-credential/src/main/scala/io/iohk/atala/mercury/protocol/issuecredential/IssueFormats.scala
index 9f319635d5..f731449e0b 100644
--- a/mercury/mercury-library/protocol-issue-credential/src/main/scala/io/iohk/atala/mercury/protocol/issuecredential/IssueFormats.scala
+++ b/mercury/mercury-library/protocol-issue-credential/src/main/scala/io/iohk/atala/mercury/protocol/issuecredential/IssueFormats.scala
@@ -67,7 +67,8 @@ Issue Credential Formats:
   */
 enum IssueCredentialProposeFormat(val name: String) {
   case Unsupported(other: String) extends IssueCredentialProposeFormat(other)
-  case JWT extends IssueCredentialProposeFormat("jwt/credential-propose@v1.0")
+  // case JWT extends IssueCredentialProposeFormat("jwt/credential-propose@v1.0") // TODO FOLLOW specs for JWT VC
+  case JWT extends IssueCredentialProposeFormat("prism/jwt") // TODO REMOVE
   case Anoncred extends IssueCredentialProposeFormat("anoncreds/credential-filter@v1.0")
 }
 
@@ -93,7 +94,8 @@ object IssueCredentialProposeFormat {
   */
 enum IssueCredentialOfferFormat(val name: String) {
   case Unsupported(other: String) extends IssueCredentialOfferFormat(other)
-  case JWT extends IssueCredentialOfferFormat("jwt/credential-offer@v1.0")
+  // case JWT extends IssueCredentialOfferFormat("jwt/credential-offer@v1.0") // TODO FOLLOW specs for JWT VC
+  case JWT extends IssueCredentialOfferFormat("prism/jwt") // TODO REMOVE
   case Anoncred extends IssueCredentialOfferFormat("anoncreds/credential-offer@v1.0")
 }
 
@@ -119,7 +121,8 @@ object IssueCredentialOfferFormat {
   */
 enum IssueCredentialRequestFormat(val name: String) {
   case Unsupported(other: String) extends IssueCredentialRequestFormat(other)
-  case JWT extends IssueCredentialRequestFormat("jwt/credential-request@v1.0")
+  // case JWT extends IssueCredentialRequestFormat("jwt/credential-request@v1.0") // TODO FOLLOW specs for JWT VC
+  case JWT extends IssueCredentialRequestFormat("prism/jwt") // TODO REMOVE
   case Anoncred extends IssueCredentialRequestFormat("anoncreds/credential-request@v1.0")
 }
 
@@ -143,7 +146,8 @@ object IssueCredentialRequestFormat {
   */
 enum IssueCredentialIssuedFormat(val name: String) {
   case Unsupported(other: String) extends IssueCredentialIssuedFormat(other)
-  case JWT extends IssueCredentialIssuedFormat("jwt/credential@v1.0")
+  // case JWT extends IssueCredentialIssuedFormat("jwt/credential@v1.0") // TODO FOLLOW specs for JWT VC
+  case JWT extends IssueCredentialIssuedFormat("prism/jwt") // TODO REMOVE
   case Anoncred extends IssueCredentialIssuedFormat("anoncreds/credential@v1.0")
 }
 
diff --git a/mercury/mercury-library/protocol-present-proof/src/main/scala/io/iohk/atala/mercury/protocol/presentproof/PresentFormats.scala b/mercury/mercury-library/protocol-present-proof/src/main/scala/io/iohk/atala/mercury/protocol/presentproof/PresentFormats.scala
index abf888fa97..010f7f8df3 100644
--- a/mercury/mercury-library/protocol-present-proof/src/main/scala/io/iohk/atala/mercury/protocol/presentproof/PresentFormats.scala
+++ b/mercury/mercury-library/protocol-present-proof/src/main/scala/io/iohk/atala/mercury/protocol/presentproof/PresentFormats.scala
@@ -47,7 +47,8 @@ Present Credential Formats:
   */
 enum PresentCredentialProposeFormat(val name: String) {
   case Unsupported(other: String) extends PresentCredentialProposeFormat(other)
-  case JWT extends PresentCredentialProposeFormat("jwt/proof-request@v1.0")
+  // case JWT extends PresentCredentialProposeFormat("jwt/proof-request@v1.0") // TODO FOLLOW specs for JWT VC
+  case JWT extends PresentCredentialProposeFormat("prism/jwt") // TODO REMOVE
   case Anoncred extends PresentCredentialProposeFormat("anoncreds/proof-request@v1.0")
 }
 
@@ -71,7 +72,8 @@ object PresentCredentialProposeFormat {
   */
 enum PresentCredentialRequestFormat(val name: String) {
   case Unsupported(other: String) extends PresentCredentialRequestFormat(other)
-  case JWT extends PresentCredentialRequestFormat("jwt/proof-request@v1.0")
+  // case JWT extends PresentCredentialRequestFormat("jwt/proof-request@v1.0") // TODO FOLLOW specs for JWT VC
+  case JWT extends PresentCredentialRequestFormat("prism/jwt") // TODO REMOVE
   case Anoncred extends PresentCredentialRequestFormat("anoncreds/proof-request@v1.0")
 }
 
@@ -95,7 +97,8 @@ object PresentCredentialRequestFormat {
   */
 enum PresentCredentialFormat(val name: String) {
   case Unsupported(other: String) extends PresentCredentialFormat(other)
-  case JWT extends PresentCredentialFormat("jwt/proof-request@v1.0")
+  // case JWT extends PresentCredentialFormat("jwt/proof-request@v1.0") // TODO FOLLOW specs for JWT VC
+  case JWT extends PresentCredentialFormat("prism/jwt") // TODO REMOVE
   case Anoncred extends PresentCredentialFormat("anoncreds/proof-request@v1.0")
 }