diff --git a/credentials/fire-fighter-vc-v2/credential.json b/credentials/fire-fighter-vc-v2/credential.json
index 8f72f36..cb4970e 100644
--- a/credentials/fire-fighter-vc-v2/credential.json
+++ b/credentials/fire-fighter-vc-v2/credential.json
@@ -9,10 +9,11 @@
     "VerifiableCredential",
     "FirstResponderCredential"
   ],
+  "id": "urn:uuid:82308bd0-2159-4e9e-9255-bec2f06defbc",
   "name": "Utopia Fire Fighter",
   "description": "Utopia Fire Fighter Identification Badge.",
   "issuer": {
-    "id": "https://www.utopia-state.gov",
+    "id": "https://www.utopia-state.example",
     "name": "Utopia State Fire Training",
     "image": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMDAgMTAwIj48cmVjdCB4PSI0IiB5PSI0IiB3aWR0aD0iOTIiIGhlaWdodD0iOTIiIHJ4PSIxNiIgZmlsbD0ibm9uZSIgc3Ryb2tlPSJibGFjayIgc3Ryb2tlLXdpZHRoPSI2Ii8+PHRleHQgeD0iNTAiIHk9IjQ0IiB0ZXh0LWFuY2hvcj0ibWlkZGxlIiBmb250LXNpemU9IjI4IiBmb250LXdlaWdodD0iNzAwIiBmb250LWZhbWlseT0iQXJpYWwsIHNhbnMtc2VyaWYiIGZpbGw9ImJsYWNrIj5VUzwvdGV4dD48dGV4dCB4PSI1MCIgeT0iNzQiIHRleHQtYW5jaG9yPSJtaWRkbGUiIGZvbnQtc2l6ZT0iMjgiIGZvbnQtd2VpZ2h0PSI3MDAiIGZvbnQtZmFtaWx5PSJBcmlhbCwgc2Fucy1zZXJpZiIgZmlsbD0iYmxhY2siPkZUPC90ZXh0Pjwvc3ZnPg=="
   },
@@ -24,7 +25,7 @@
     "image": "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDABsSFBcUERsXFhceHBsgKEIrKCUlKFE6PTBCYFVlZF9VXVtqeJmBanGQc1tdhbWGkJ6jq62rZ4C8ybqmx5moq6T/wAALCAC+AIABAREA/8QAGgAAAgMBAQAAAAAAAAAAAAAAAAQBAgMFBv/EADQQAAEEAAQFAgQFAwUAAAAAAAEAAgMRBBIhMQVBUWFxEyIGMoGhI0KRscEUJFKS0eHw8f/aAAgBAQAAPwD0KlClZzTMgjL5HANC5GI4/HZbFE53ckLnu4vivUzxOLB0uwtm8bxJZTsp8iv2W0HHHgVLrWxHPyujg+KYfFUzMGSf4k7+E8CCLClCEKFCEEgb6JTH45mFiLszL76/Zebx3F5sX7S6mdGtq1z3A76/opjJOlnwtPTcNWOc7sRsrMcyT2O9rh1WRJik0BFFdvBcadFGGvObWl6Jrg4WDYKshCFVCznnjw8ZkleGNHUrx3FMY7GYkuzOc0H2/wDiSonZXa7Lobvurl7SNhflSJ7blcNeqxJIdYP1Vw/MMrh4KhvtJG4K7XBuMehcWKf7d8x3XpmOD2Bw2IsKUIVUHZea4/iY3Seg115fmPMnz/C4o30IvvzV7FagLRro69xH1WMmQ6t37Kvpu6Ic3LQ5q7GAi/ssyKUhx/5Xr+AYk4jAgPfmdGcpPbkumhCqh10ctXyteK4tH6WMc2y47k9yk66arRkZJ7piHC3qU1FgA7Up6LAMDRpflWkwUR/IErPw9hBptJCTB5LISpZlBNdl2vhmQjEvjtoBG3Mr0yEKqDdGt14jiJvFSWfzHU81jE3MTSdhiT8EIpNsYAmG1VKwAVHsBSGJiytJpc2VrXtAaOaY4CwjiW2mq9UhCqpXjOMxuj4nLmG7rHjkssIzM5xK6DAm4kw0arVpVmlBWMzQ5jgVw3+zEOHKl0uBsBxeYflau+hChC838TwZcQyUD5m0T4XPwTdXp+MXSZjFJllKw3WjVD3NG5VHhcDiDDFO5vI6hdP4ZdmfN2A/dd5CFCFyfiVl4Br6vI8X2B/6Fw8FQhce5tbNnkBtkZKuzF4hp98f2T0MwcOiYcXBthI4mSW7E2QdzSMPTvmxTXHoCm2Ne01msJHi7ASw1rRC14IXYKLNIAPVcNOdL0CEKELg/EMr3zDDB5DSy6B0Jtc3BNqJ2YbOVnyS58kQoc3VaqIcQWlz3v57lbYQyNc0P5912hToqXNxOGzSm6LSKVYOGDU3R5VyXQgifG0Nc7MBsVhjow4xXtmorSdjSyMto6jZdgbIQoQuF8QRO/qoJfylpBPhIYfWM1/kU1FGNCtHsBCXAqSx1XVi+Qd1cxg61qpa0DkpIS8sYlLWHrarhmfiCI65XAfdddCFCEjxqL1OHvI3YQf4/lcDBgtY5jtwU9Eru2WA90lDqunGKYFe9NVIQ7ZYGzIA3ejRW+GhqawNBqT1KdQhQhQ9jZI3Mdq1worzTozDM6IisunlaxFaSGmlJ+o71GgGq+6fa574yA8sPUbpqEH0wHOzHqrN0UOOipE1zpPaLNLoQxljddzuroQoQhc7jMY9FkgAzZqvsuW11KHucSNfoqxsBkBcQmo2n1CcwqtEy0gA/iD9VSCZshtjswvcc1s4rbBD8Z3ZqdQhChCEtxGP1MFIBuBmH0XAB9wKmaFsraN2DuN1SPDuadXu+iciw4vV70y3CRke5tjvqpMbY300ADsq5wAdUzww5jK7wE8hCFCEIqxR2Xl8Uz0sVLGLprtPCGyW49Ew0WLBpaYcOLtyndWt7pdzrdZKwdbnBrNS77LqYBoYHNHIBNoQhVUoQvN8TF46Xzv9Emx9PyndOQSEkNT0bspAVpJLpoNpXETe/IwW7ot8ND6bLJtx3Kewmj3eE0hCFVShAXnuJj+/l8j9klJHmIcNHDYoilMb/fomxi2Zwc4/VR/UOlkqFt6aE7JjD4fIczjbzqSnG7LXDuDZtTVhOIQhVUoSmN4jBhGGznkugxp1JXEnmOImMrmhpduAVnSnKCNVtBhmEWGD9E4yNrQNFqB20Vwocl4nS4TEgscTE+7YTsey6kWIZKco0d0K1QqhVllZCwvkeGtHMri4/i75GlkALGHTNzP+y5l55weQGi3aFelIam8PsQmAFcaKQFBCynIztHTVUzairsc+ichxtDLL/qTbXBwtpBHULnYrikcdth97+vJcmaaSd+eVxceXQLCRtgeVQ+xzXHrRTLNlq0aKzW+5MwtrZMtClSEGgLOwSjnFzi7qpaNFOysyV8RzMdpzHJcoizZ3UUgtvdULczSDz0K1i+WjuN1uzQrTLVELaJbg6KQrBYTS5va3br1We+n6q31Qe6huoISFKKobIoKpbWo2UgUe/VaF4aReibY3NHakaDotM4Vy8NbZKxfIXaDQKoFHRWApTug7KrdHHVKFqgDVFIAs0oqvF0gih1C2hmcxtAClYvLrOyize5vyrC61KsNTXRX2FBCsOigi1n+Zf//Z",
     "ownerInformation": {
       "homeUnit": {
-        "id": "https://www.utopia-state.gov",
+        "id": "https://www.utopia-state.example",
         "organizationName": "Utopia State Fire Department"
       }
     },
diff --git a/credentials/fr-medical-technician/credential.json b/credentials/fr-medical-technician/credential.json
index 0b82146..2aca135 100644
--- a/credentials/fr-medical-technician/credential.json
+++ b/credentials/fr-medical-technician/credential.json
@@ -9,6 +9,7 @@
     "VerifiableCredential",
     "FirstResponderCredential"
   ],
+  "id": "urn:uuid:335622d9-b481-4498-87a1-8b9096af1f5f",
   "name": "Medical Technician",
   "description":"First Responder Identification Badge.",
   "issuer": {