diff --git a/collections/CV_Covid_19_cases.yaml b/collections/CV_Covid_19_cases.yaml
index b873525b..ae549de6 100644
--- a/collections/CV_Covid_19_cases.yaml
+++ b/collections/CV_Covid_19_cases.yaml
@@ -1,21 +1,28 @@
 Name: CV_Covid_19_cases
 Title: Covid-19 Cases
 EodashIdentifier: CV
-Description: CV_Covid_19_cases/CV.md
+Description: CV_Covid_19_cases/CV_Covid_19_cases.md
 Themes:
-    - health
+  - health
 Tags:
-    - placeholder
-Satellite:
-    - placeholder
-Sensor:
-    - placeholder
+  - Covid-19
+  - Human activities
+  - Open data
+DataSource:
+  InSitu:
+    - Other
 Agency:
-    - ESA
+  - ESA
+Citation:
+  Citation: |
+    Hasell, J., Mathieu, E., Beltekian, D. et al. A cross-country database of COVID-19 testing. Sci Data 7, 345 (2020).
+  DOI: 10.1038/s41597-020-00688-8
 Resources:
-    - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
-      Name: GeoDB
-      Database: eodash
-      CollectionId: Global_COVID_data
-      AdditionalQueryString: 'aoi_id=in.("AL","AT","BA","BE","BG","CH","CZ","DE","DK","EE","ES","FI","FR","GB","GR","HR","HU","IE","IT","LT","LU","LV","MK","MT","NL","NO","PL","PT","RO","RS","SE","SI","SK","TR","XK")'
-      IdKey: 'aoi_id'
+  - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
+    Name: GeoDB
+    Database: eodash
+    CollectionId: Global_COVID_data
+    AdditionalQueryString: 'aoi_id=in.("AL","AT","BA","BE","BG","CH","CZ","DE","DK","EE","ES","FI","FR","GB","GR","HR","HU","IE","IT","LT","LU","LV","MK","MT","NL","NO","PL","PT","RO","RS","SE","SI","SK","TR","XK")'
+Provider:
+  - Name: Our World in Data
+    Url: https://ourworldindata.org/covid-cases
diff --git a/collections/CV_Covid_19_cases_trilateral.yaml b/collections/CV_Covid_19_cases_trilateral.yaml
index 6a633c58..38aaa12a 100644
--- a/collections/CV_Covid_19_cases_trilateral.yaml
+++ b/collections/CV_Covid_19_cases_trilateral.yaml
@@ -1,20 +1,27 @@
 Name: CV_Covid_19_cases_trilateral
 Title: Covid-19 Cases
 EodashIdentifier: CV
-Description: CV_Covid_19_cases/CV.md
+Description: CV_Covid_19_cases/CV_Covid_19_cases.md
 Themes:
-    - covid-19
+  - health
 Tags:
-    - placeholder
-Satellite:
-    - placeholder
-Sensor:
-    - placeholder
+  - Covid-19
+  - Human activities
+  - Open data
+DataSource:
+  InSitu:
+    - Other
 Agency:
-    - ESA
+  - ESA
+Citation:
+  Citation: |
+    Hasell, J., Mathieu, E., Beltekian, D. et al. A cross-country database of COVID-19 testing. Sci Data 7, 345 (2020).
+  DOI: 10.1038/s41597-020-00688-8
 Resources:
-    - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
-      Name: GeoDB
-      Database: eodash
-      CollectionId: Global_COVID_data
-      IdKey: 'aoi_id'
+  - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
+    Name: GeoDB
+    Database: eodash
+    CollectionId: Global_COVID_data
+Provider:
+  - Name: Our World in Data
+    Url: https://ourworldindata.org/covid-cases
diff --git a/collections/OW_Covid_19_vaccinations.yaml b/collections/OW_Covid_19_vaccinations.yaml
index 52637ccf..578e549b 100644
--- a/collections/OW_Covid_19_vaccinations.yaml
+++ b/collections/OW_Covid_19_vaccinations.yaml
@@ -14,9 +14,9 @@ DataSource:
 Agency:
   - ESA
 Citation:
-    Citation: |
-      Edouard Mathieu, Hannah Ritchie, Lucas Rodés-Guirao, Cameron Appel, Charlie Giattino, Joe Hasell, Bobbie Macdonald, Saloni Dattani, Diana Beltekian, Esteban Ortiz-Ospina and Max Roser (2020) - "Coronavirus Pandemic (COVID-19)". 
-      Published online at OurWorldInData.org. Retrieved from: 'https://ourworldindata.org/coronavirus' [Online Resource]
+  Citation: |
+    Edouard Mathieu, Hannah Ritchie, Lucas Rodés-Guirao, Cameron Appel, Charlie Giattino, Joe Hasell, Bobbie Macdonald, Saloni Dattani, Diana Beltekian, Esteban Ortiz-Ospina and Max Roser (2020) - "Coronavirus Pandemic (COVID-19)". 
+    Published online at OurWorldInData.org. Retrieved from: 'https://ourworldindata.org/coronavirus' [Online Resource]
 Resources:
   - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
     Name: GeoDB
diff --git a/collections/OW_Covid_19_vaccinations_trilateral.yaml b/collections/OW_Covid_19_vaccinations_trilateral.yaml
index 759f7759..d6b33b08 100644
--- a/collections/OW_Covid_19_vaccinations_trilateral.yaml
+++ b/collections/OW_Covid_19_vaccinations_trilateral.yaml
@@ -1,20 +1,27 @@
 Name: OW_Covid_19_vaccinations_trilateral
 Title: Covid-19 Vaccinations
 EodashIdentifier: OW
-Description: OW_Covid_19_vaccinations/OW.md
+Description: OW_Covid_19_vaccinations/OW_Covid_19_vaccinations.md
 Themes:
-    - covid-19
+  - health
 Tags:
-    - placeholder
-Satellite:
-    - placeholder
-Sensor:
-    - placeholder
+  - Covid-19
+  - Human activities
+  - Open data
+DataSource:
+  InSitu:
+    - Other
 Agency:
-    - ESA
+  - ESA
+Citation:
+  Citation: |
+    Edouard Mathieu, Hannah Ritchie, Lucas Rodés-Guirao, Cameron Appel, Charlie Giattino, Joe Hasell, Bobbie Macdonald, Saloni Dattani, Diana Beltekian, Esteban Ortiz-Ospina and Max Roser (2020) - "Coronavirus Pandemic (COVID-19)". 
+    Published online at OurWorldInData.org. Retrieved from: 'https://ourworldindata.org/coronavirus' [Online Resource]
 Resources:
-    - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
-      Name: GeoDB
-      Database: eodash
-      CollectionId: Global_COVID_vaccination_data
-      IdKey: 'aoi_id'
+  - EndPoint: https://xcube-geodb.brockmann-consult.de/eodash/6bf15325-f6a0-4b6a-bf80-a2491753f8f2/
+    Name: GeoDB
+    Database: eodash
+    CollectionId: Global_COVID_vaccination_data
+Provider:
+  - Name: Our World in Data
+    Url: https://ourworldindata.org/covid-vaccinations