diff --git a/contexts/credentials/v2 b/contexts/credentials/v2
index 01b1c5e4f..d799c0940 100644
--- a/contexts/credentials/v2
+++ b/contexts/credentials/v2
@@ -5,6 +5,7 @@
 
     "id": "@id",
     "type": "@type",
+
     "kid": {
       "@id": "https://www.iana.org/assignments/jose#kid",
       "@type": "@id"
@@ -146,7 +147,8 @@
         "verifiableCredential": {
           "@id": "https://www.w3.org/2018/credentials#verifiableCredential",
           "@type": "@id",
-          "@container": "@graph"
+          "@container": "@graph",
+          "@context": null
         },
         "termsOfUse": {
           "@id": "https://www.w3.org/2018/credentials#termsOfUse",
@@ -273,7 +275,10 @@
             }
           }
         },
-        "cryptosuite": "https://w3id.org/security#cryptosuite",
+        "cryptosuite": {
+          "@id": "https://w3id.org/security#cryptosuite",
+          "@type": "https://w3id.org/security#cryptosuiteString"
+        },
         "proofValue": {
           "@id": "https://w3id.org/security#proofValue",
           "@type": "https://w3id.org/security#multibase"