diff --git a/.github/ISSUE_TEMPLATE/cmipld_experiment.yml b/.github/ISSUE_TEMPLATE/cmipld_experiment.yml
index 1e2b7cb8..20a1f39b 100644
--- a/.github/ISSUE_TEMPLATE/cmipld_experiment.yml
+++ b/.github/ISSUE_TEMPLATE/cmipld_experiment.yml
@@ -18,25 +18,11 @@ body:
 -   id: activity
     attributes:
         label: Activity
-        description: Enter the activity
-        options:
-        - aerchemmip
-        - c4mip
-        - cfmip
-        - cmip
-        - damip
-        - dcpp
-        - geomip
-        - lesfmip
-        - lmip
-        - pmip
-        - ramip
-        - rfmip
-        - scenariomip
-        - tipmip
+        description: 'A reference object from <a href=https://wcrp-cmip.github.io/WCRP-universe/activity/>
+            https://wcrp-cmip.github.io/WCRP-universe/activity/ </a>. '
     validations:
         required: true
-    type: dropdown
+    type: input
 -   id: description
     attributes:
         label: Description
@@ -69,93 +55,27 @@ body:
 -   id: parent_activity
     attributes:
         label: Parent Activity
-        description: Enter the parent activity
-        options:
-        - aerchemmip
-        - c4mip
-        - cfmip
-        - cmip
-        - damip
-        - dcpp
-        - geomip
-        - lesfmip
-        - lmip
-        - pmip
-        - ramip
-        - rfmip
-        - scenariomip
-        - tipmip
+        description: 'A reference object from <a href=https://wcrp-cmip.github.io/WCRP-universe/activity/>
+            https://wcrp-cmip.github.io/WCRP-universe/activity/ </a>. '
     validations:
         required: true
-    type: dropdown
+    type: input
 -   id: parent_experiment
     attributes:
         label: Parent Experiment
-        description: Enter the parent experiment
-        options:
-        - 1pctco2
-        - abrupt_4xco2
-        - amip
-        - esm-up2p0
-        - esm-up2p0-gwl2p0
-        - esm-up2p0-gwl2p0-50y-dn2p0
-        - esm-up2p0-gwl4p0
-        - esm-up2p0-gwl4p0-50y-dn2p0
-        - esm-up2p0-gwl4p0-50y-dn2p0-gwl2p0
-        - esm_hist
-        - esm_picontrol
-        - esm_picontrol_spinup
-        - fut_aer
-        - fut_ghg
-        - fut_lu
-        - fut_sol
-        - fut_totalo3
-        - fut_volc
-        - hist_aer
-        - hist_ghg
-        - hist_lu
-        - hist_nat
-        - hist_nolu
-        - hist_piaer
-        - hist_pighg
-        - hist_pisol
-        - hist_pitotalo3
-        - hist_pivolc
-        - hist_sol
-        - hist_totalo3
-        - hist_volc
-        - historical
-        - piclim-370
-        - piclim-370-126aer
-        - piclim-370-126aer_nh3nox
-        - piclim-370-afr126aer
-        - piclim-370-eas126aer
-        - piclim-370-nae126aer
-        - piclim-370-sas126aer
-        - picontrol
-        - picontrol_spinup
-        - ssp370-126aer
-        - ssp370-126aer_nh3nox
-        - ssp370-afr126aer
-        - ssp370-asia126aer
-        - ssp370-eas126aer
-        - ssp370-nae126aer
-        - ssp370-saf126ca
-        - ssp370-sas126aer
-        - ssp370-sas126ca
+        description: 'A reference object from <a href=https://wcrp-cmip.github.io/CMIP6Plus_CVs/experiment/>
+            https://wcrp-cmip.github.io/CMIP6Plus_CVs/experiment/ </a>. '
     validations:
         required: true
-    type: dropdown
+    type: input
 -   id: sub_experiment
     attributes:
         label: Sub Experiment
-        description: Enter the sub experiment
-        options:
-        - f2023
-        - none
+        description: 'A reference object from <a href=https://wcrp-cmip.github.io/CMIP6Plus_CVs/sub_experiment/>
+            https://wcrp-cmip.github.io/CMIP6Plus_CVs/sub_experiment/ </a>. '
     validations:
         required: true
-    type: dropdown
+    type: input
 -   id: tier
     attributes:
         label: Tier
diff --git a/.github/ISSUE_TEMPLATE/cmipld_source.yml b/.github/ISSUE_TEMPLATE/cmipld_source.yml
index eb875613..11b56059 100644
--- a/.github/ISSUE_TEMPLATE/cmipld_source.yml
+++ b/.github/ISSUE_TEMPLATE/cmipld_source.yml
@@ -18,25 +18,11 @@ body:
 -   id: activity-participation
     attributes:
         label: Activity-Participation
-        description: Enter the activity-participation
-        options:
-        - aerchemmip
-        - c4mip
-        - cfmip
-        - cmip
-        - damip
-        - dcpp
-        - geomip
-        - lesfmip
-        - lmip
-        - pmip
-        - ramip
-        - rfmip
-        - scenariomip
-        - tipmip
+        description: 'A reference object from <a href=https://wcrp-cmip.github.io/WCRP-universe/activity/>
+            https://wcrp-cmip.github.io/WCRP-universe/activity/ </a>. '
     validations:
         required: true
-    type: dropdown
+    type: input
 -   id: activity_participation
     attributes:
         label: Activity Participation
diff --git a/src-data/_context_ b/src-data/_context_
index 8d8a08a3..1aba673f 100644
--- a/src-data/_context_
+++ b/src-data/_context_
@@ -11,8 +11,5 @@
         "universal": "https://wcrp-cmip.github.io/WCRP-universe/",
         "variables": "https://wcrp-cmip.github.io/MIP-variables/"
     },
-    "type": [
-        "cmip6plus"
-    ],
     "@embed": "@always"
 }
\ No newline at end of file
diff --git a/src-data/experiment/_context_ b/src-data/experiment/_context_
index acc5a57c..271498d6 100644
--- a/src-data/experiment/_context_
+++ b/src-data/experiment/_context_
@@ -26,5 +26,11 @@
             }
         }
     ],
-    "@embed": "@always"
+    "@embed": "@always",
+    "type": [
+        "cmip6plus"
+    ],
+    "@type": [
+        "cmip6plus"
+    ]
 }
\ No newline at end of file
diff --git a/src-data/project/_context_ b/src-data/project/_context_
index 89a67605..fa828358 100644
--- a/src-data/project/_context_
+++ b/src-data/project/_context_
@@ -30,5 +30,11 @@
             }
         }
     ],
-    "@embed": "@always"
+    "@embed": "@always",
+    "type": [
+        "cmip6plus"
+    ],
+    "@type": [
+        "cmip6plus"
+    ]
 }
\ No newline at end of file
diff --git a/src-data/source/_context_ b/src-data/source/_context_
index dd4cc2b6..3bf678d0 100644
--- a/src-data/source/_context_
+++ b/src-data/source/_context_
@@ -19,5 +19,11 @@
             }
         }
     ],
-    "@embed": "@always"
+    "@embed": "@always",
+    "type": [
+        "cmip6plus"
+    ],
+    "@type": [
+        "cmip6plus"
+    ]
 }
\ No newline at end of file
diff --git a/src-data/sub_experiment/_context_ b/src-data/sub_experiment/_context_
index 36d6ee0e..b183adef 100644
--- a/src-data/sub_experiment/_context_
+++ b/src-data/sub_experiment/_context_
@@ -6,5 +6,11 @@
             "@vocab": "https://wcrp-cmip.github.io/CMIP6Plus_CVs/sub_experiment/"
         }
     ],
-    "@embed": "@always"
+    "@embed": "@always",
+    "type": [
+        "cmip6plus"
+    ],
+    "@type": [
+        "cmip6plus"
+    ]
 }
\ No newline at end of file