diff --git a/idhub/templates/credentials/course-credential.json b/idhub/templates/credentials/course-credential.json
index f3c299b..d4a97cb 100644
--- a/idhub/templates/credentials/course-credential.json
+++ b/idhub/templates/credentials/course-credential.json
@@ -2,25 +2,7 @@
     "@context": [
       "https://www.w3.org/2018/credentials/v1",
       "https://idhub.pangea.org/credentials/base/v1",
-      {
-        "firstName": "https://idhub.pangea.org/context/#firstName",
-        "lastName": "https://idhub.pangea.org/context/#lastName",
-        "personalIdentifier": "https://idhub.pangea.org/context/#personalIdentifier",
-        "issuedDate": "https://idhub.pangea.org/context/#issuedDate",
-        "modeOfInstruction": "https://idhub.pangea.org/context/#modeOfInstruction",
-        "courseDuration": "https://idhub.pangea.org/context/#courseDuration",
-        "courseDays": "https://idhub.pangea.org/context/#courseDays",
-        "courseName": "https://idhub.pangea.org/context/#courseName",
-        "courseDescription": "https://idhub.pangea.org/context/#courseDescription",
-        "gradingScheme": "https://idhub.pangea.org/context/#gradingScheme",
-        "scoreAwarded": "https://idhub.pangea.org/context/#scoreAwarded",
-        "qualificationAwarded": "https://idhub.pangea.org/context/#qualificationAwarded",
-        "courseLevel": "https://idhub.pangea.org/context/#courseLevel",
-        "courseFramework": "https://idhub.pangea.org/context/#courseFramework",
-        "courseCredits": "https://idhub.pangea.org/context/#courseCredits",
-        "dateOfAssessment": "https://idhub.pangea.org/context/#dateOfAssessment",
-        "evidenceAssessment": "https://idhub.pangea.org/context/#evidenceAssessment"
-      }
+      "https://idhub.pangea.org/credentials/course-credential/v1"
     ],
     "id": "{{ vc_id }}",
     "type": [
@@ -59,6 +41,7 @@
         "id": "{{ subject_did }}",
         "firstName": "{{ firstName }}",
         "lastName": "{{ lastName }}",
+        "email": "{{ email }}",
         "personalIdentifier": "{{ personalIdentifier }}",
         "issuedDate": "{{ issuedDate }}",
         "modeOfInstruction": "{{ modeOfInstruction }}",
diff --git a/idhub/templates/credentials/e-operator-claim.json b/idhub/templates/credentials/e-operator-claim.json
index 959472c..1b85bbe 100644
--- a/idhub/templates/credentials/e-operator-claim.json
+++ b/idhub/templates/credentials/e-operator-claim.json
@@ -2,14 +2,7 @@
     "@context": [
       "https://www.w3.org/2018/credentials/v1",
       "https://idhub.pangea.org/credentials/base/v1",
-      {
-        "legalName": "https://idhub.pangea.org/context/#legalName",
-        "accreditedBy": "https://idhub.pangea.org/context/#accreditedBy",
-        "operatorNumber": "https://idhub.pangea.org/context/#operatorNumber",
-        "limitJurisdiction": "https://idhub.pangea.org/context/#limitJurisdiction",
-        "accreditedFor": "https://idhub.pangea.org/context/#accreditedFor",
-        "role": "https://idhub.pangea.org/context/#role"
-      }
+      "https://idhub.pangea.org/credentials/e-operator-claim/v1"
     ],
     "id": "{{ vc_id }}",
     "type": [
@@ -59,7 +52,8 @@
         "operatorNumber": "{{ operatorNumber }}",
         "limitJurisdiction": "{{ limitJurisdiction }}",
         "accreditedFor": "{{ accreditedFor }}",
-        "role": "{{ role }}"
+        "role": "{{ role }}",
+        "email": "{{ email }}"
     },
     "credentialSchema": {
       "id": "https://idhub.pangea.org/vc_schemas/federation-membership.json",