diff --git a/static/files/vc-schemas/ubi/CasteCertificate.json b/static/files/vc-schemas/ubi/CastCertificate.json
similarity index 54%
rename from static/files/vc-schemas/ubi/CasteCertificate.json
rename to static/files/vc-schemas/ubi/CastCertificate.json
index 9ff55ff..46cb698 100644
--- a/static/files/vc-schemas/ubi/CasteCertificate.json
+++ b/static/files/vc-schemas/ubi/CastCertificate.json
@@ -4,45 +4,32 @@
     "@protected": true,
     "type": "@type",
     "schema": "https://schema.org/",
-    "CasteCertificate": {
-      "@id": "https://tekdi.github.io/files/vc-schemas/ubi/CasteCertificate.json#CasteCertificate"
+    "CastCertificate": {
+      "@id": "https://tekdi.github.io/files/vc-schemas/ubi/CastCertificate.json#CastCertificate"
     },
-    "aadharNumber": "schema:Text",
-    "familyLeaderBhamashahNumber": "schema:Text",
-    "relationWithApplicant": "schema:Text",
     "studentId": "schema:Text",
-    "schoolId": "schema:Text",
+    "familyLeaderBhamashahNumber": "schema:Text",
+    "relationwithApplicant": "schema:Text",
     "firstName": "schema:Text",
     "middleName": "schema:Text",
     "lastName": "schema:Text",
     "castName": "schema:Text",
+    "castCategory": "schema:Text",
     "castCategoryNumber": "schema:Text",
     "addressLine1": "schema:Text",
-    "addressLine2": "schema:Text",
-    "house": "schema:Text",
-    "landmark": "schema:Text",
-    "locality": "schema:Text",
     "vtc": "schema:Text",
     "district": "schema:Text",
     "pin": "schema:Text",
     "state": "schema:Text",
     "country": "schema:Text",
     "orgName": "schema:Text",
-    "orgCode": "schema:Text",
     "orgType": "schema:Text",
-    "orgOfficerName": "schema:Text",
     "orgOfficerRank": "schema:Text",
-    "orgOfficerSign": "schema:Text",
-    "orgAddressLine1": "schema:Text",
-    "orgAddressLine2": "schema:Text",
-    "orgLandmark": "schema:Text",
-    "orgLocality": "schema:Text",
-    "orgVtc": "schema:Text",
     "orgDistrict": "schema:Text",
     "orgPin": "schema:Text",
     "orgState": "schema:Text",
     "orgCountry": "schema:Text",
-    "dateOfIssuance": "schema:Date",
+    "dateofIssuance": "schema:Text",
     "certificateNumber": "schema:Text"
   }
 }
diff --git a/static/files/vc-schemas/ubi/EnrollmentCertificate.json b/static/files/vc-schemas/ubi/EnrollmentCertificate.json
index 879922c..f8309d6 100644
--- a/static/files/vc-schemas/ubi/EnrollmentCertificate.json
+++ b/static/files/vc-schemas/ubi/EnrollmentCertificate.json
@@ -8,26 +8,26 @@
       "@id": "https://tekdi.github.io/files/vc-schemas/ubi/EnrollmentCertificate.json#EnrollmentCertificate"
     },
     "studentId": "schema:Text",
-    "schoolId": "schema:Text",
     "firstName": "schema:Text",
     "middleName": "schema:Text",
     "lastName": "schema:Text",
-    "gradeLevel": "schema:Text",
-    "addressLine1": "schema:Text",
-    "addressLine2": "schema:Text",
+    "academicYear": "schema:Text",
+    "class": "schema:Text",
+    "schoolUniqueCode": "schema:Text",
+    "schoolAddressLine1": "schema:Text",
+    "schoolAddressLine2": "schema:Text",
     "landmark": "schema:Text",
     "locality": "schema:Text",
     "district": "schema:Text",
     "pin": "schema:Text",
     "state": "schema:Text",
     "country": "schema:Text",
-    "schoolYear": "schema:Text",
     "studentStatus": "schema:Text",
     "schoolName": "schema:Text",
-    "schoolRegistrationNumber": "schema:Text",
-    "principalName": "schema:Text",
+    "authorityName": "schema:Text",
     "principalDesignation": "schema:Text",
-    "dayMonthYear": "schema:Date",
-    "learnerReferenceNumber": "schema:Text"
+    "validUpto": "schema:Text",
+    "issuanceDate": "schema:Text",
+    "certificateEnrollmentId": "schema:Text"
   }
 }
diff --git a/static/files/vc-schemas/ubi/IncomeCertificate.json b/static/files/vc-schemas/ubi/IncomeCertificate.json
new file mode 100644
index 0000000..459479d
--- /dev/null
+++ b/static/files/vc-schemas/ubi/IncomeCertificate.json
@@ -0,0 +1,41 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@protected": true,
+    "type": "@type",
+    "schema": "https://schema.org/",
+    "IncomeCertificate": {
+      "@id": "https://tekdi.github.io/files/vc-schemas/ubi/IncomeCertificate.json#IncomeCertificate"
+    },
+    "studenId": "schema:Text",
+    "fatherName": "schema:Text",
+    "motherName": "schema:Text",
+    "husbandName": "schema:Text",
+    "wifeName": "schema:Text",
+    "addressLine1": "schema:Text",
+    "vtc": "schema:Text",
+    "district": "schema:Text",
+    "pin": "schema:Text",
+    "state": "schema:Text",
+    "country": "schema:Text",
+    "casteName": "schema:Text",
+    "casteCategory": "schema:Text",
+    "totalAnnualFamilyIncome": "schema:Text",
+    "incomeFromAgriculture": "schema:Text",
+    "incomeFromSalary": "schema:Text",
+    "incomeFromTradeBusiness": "schema:Text",
+    "incomeFromOtherSources": "schema:Text",
+    "orgName": "schema:Text",
+    "orgType": "schema:Text",
+    "orgOfficerRank": "schema:Text",
+    "orgAddressLine1": "schema:Text",
+    "orgAddressLine2": "schema:Text",
+    "orgDistrict": "schema:Text",
+    "orgPin": "schema:Text",
+    "orgState": "schema:Text",
+    "orgCountry": "schema:Text",
+    "issuanceDate": "schema:Text",
+    "certificateNumber": "schema:Text",
+    "validUpto": "schema:Text"
+  }
+}
diff --git a/static/files/vc-schemas/ubi/JanAadharCertificate.json b/static/files/vc-schemas/ubi/JanAadharCertificate.json
new file mode 100644
index 0000000..ec23afd
--- /dev/null
+++ b/static/files/vc-schemas/ubi/JanAadharCertificate.json
@@ -0,0 +1,31 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@protected": true,
+    "type": "@type",
+    "schema": "https://schema.org/",
+    "JanAadharCertificate": {
+      "@id": "https://tekdi.github.io/files/vc-schemas/ubi/JanAadharCertificate.json#JanAadharCertificate"
+    },
+    "studentId": "schema:Text",
+    "familyIdentificationNumber": "schema:Text",
+    "firstName": "schema:Text",
+    "middleName": "schema:Text",
+    "lastName": "schema:Text",
+    "gender": "schema:Text",
+    "dob": "schema:Text",
+    "personalIdentificationNumber": "schema:Text",
+    "familyBankAccountNumber": "schema:Text",
+    "addressLine1": "schema:Text",
+    "addressLine2": "schema:Text",
+    "vtc": "schema:Text",
+    "district": "schema:Text",
+    "pin": "schema:Text",
+    "state": "schema:Text",
+    "country": "schema:Text",
+    "relationwithFamilyLeader": "schema:Text",
+    "orgName": "schema:Text",
+    "orgType": "schema:Text",
+    "idNumber": "schema:Text"
+  }
+}
diff --git a/static/files/vc-schemas/ubi/Marksheet.json b/static/files/vc-schemas/ubi/Marksheet.json
new file mode 100644
index 0000000..df0f116
--- /dev/null
+++ b/static/files/vc-schemas/ubi/Marksheet.json
@@ -0,0 +1,28 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@protected": true,
+    "type": "@type",
+    "schema": "https://schema.org/",
+    "Marksheet": {
+      "@id": "https://tekdi.github.io/files/vc-schemas/ubi/Marksheet.json#Marksheet"
+    },
+    "studentId": "schema:Text",
+    "firstName": "schema:Text",
+    "middleName": "schema:Text",
+    "lastName": "schema:Text",
+    "schoolUniqueCode": "schema:Text",
+    "schoolName": "schema:Text",
+    "class": "schema:Text",
+    "examDate": "schema:Text",
+    "cgpa": "schema:Text",
+    "cgpaMax": "schema:Text",
+    "grade": "schema:Text",
+    "marksMax": "schema:Text",
+    "marksTotal": "schema:Text",
+    "percentage": "schema:Text",
+    "result": "schema:Text",
+    "academicYear": "schema:Text",
+    "issuerName": "schema:Text"
+  }
+}
diff --git a/static/files/vc-schemas/ubi/SportsParticipationCertificate.json b/static/files/vc-schemas/ubi/SportsParticipationCertificate.json
new file mode 100644
index 0000000..0e1be74
--- /dev/null
+++ b/static/files/vc-schemas/ubi/SportsParticipationCertificate.json
@@ -0,0 +1,39 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@protected": true,
+    "type": "@type",
+    "schema": "https://schema.org/",
+    "SportsParticipationCertificate": {
+      "@id": "https://tekdi.github.io/files/vc-schemas/ubi/SportsParticipationCertificate.json#SportsParticipationCertificate"
+    },
+    "studentId": "schema:Text",
+    "firstName": "schema:Text",
+    "middleName": "schema:Text",
+    "lastName": "schema:Text",
+    "schoolName": "schema:Text",
+    "class": "schema:Text",
+    "addressLine1": "schema:Text",
+    "vtc": "schema:Text",
+    "district": "schema:Text",
+    "pin": "schema:Text",
+    "state": "schema:Text",
+    "country": "schema:Text",
+    "organizingVenue": "schema:Text",
+    "eventName": "schema:Text",
+    "eventStartDate": "schema:Text",
+    "eventEndDate": "schema:Text",
+    "typeofSport": "schema:Text",
+    "rank": "schema:Text",
+    "orgName": "schema:Text",
+    "orgCode": "schema:Text",
+    "orgType": "schema:Text",
+    "orgOfficerName": "schema:Text",
+    "orgOfficerRank": "schema:Text",
+    "orgDistrict": "schema:Text",
+    "orgPin": "schema:Text",
+    "orgState": "schema:Text",
+    "orgCountry": "schema:Text",
+    "certificateNumber": "schema:Text"
+  }
+}