diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a58408e8..891d4132 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,3 +22,9 @@ repos:
     hooks:
       - id: prettier
         types_or: [yaml]
+  - repo: https://github.com/citation-file-format/cffconvert
+    rev: "054bda51dbe278b3e86f27c890e3f3ac877d616c"
+    hooks:
+      - id: "validate-cff"
+        args:
+          - "--verbose"
diff --git a/CITATION.cff b/CITATION.cff
index 890c5a89..dac47250 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -4,7 +4,7 @@ message: |
   Authors are listed in alphabetical order.
 
 title: "earthaccess"
-doi: "https://doi.org/10.5281/zenodo.8365009"
+doi: "10.5281/zenodo.8365009"
 abstract: "Python Library for NASA Earthdata APIs"
 contact:
   - name: "The earthaccess community"
@@ -12,7 +12,10 @@ contact:
   - name: "NSIDC"
     email: "nsidc@nsidc.org"
 type: "software"
-license: ["MIT"]
+# NOTE: The CFF spec says `license` can be a list, but Zenodo is currently not
+#       accepting lists for this key:
+#       https://github.com/zenodo/zenodo/issues/2515
+license: "MIT"
 keywords:
   - "data"
   - "Remote sensing"
@@ -27,51 +30,61 @@ version: "0.8.2"
 date-released: "2023-12-06"
 
 authors:
-- family-names: "Barrett"
-  given-names: "Andrew"
-  orcid: "https://orcid.org/0000-0003-4394-5445"
-  website: "https://github.com/andypbarrett"
-- family-names: "Battisto"
-  given-names: "Chris"
-  orcid: "https://orcid.org//0000-0002-9608-3634"
-  website: "https://github.com/battistowx"
-- family-names: "Bourbeau"
-  given-names: "James"
-  orcid: "https://orcid.org/0000-0003-2164-7789"
-  website: "https://github.com/jrbourbeau"
-- family-names: "Fisher"
-  given-names: "Matt"
-  orcid: "https://orcid.org/0000-0003-3260-5445"
-  website: "https://mfisher87.github.io/"
-- family-names: "Kaufman"
-  given-names: "Daniel"
-  orcid: "https://orcid.org/0000-0002-1487-7298"
-  website: "https://github.com/danielfromearth"
-- family-names: "Kennedy"
-  given-names: "Joseph"
-  orcid: "https://orcid.org/0000-0002-9348-693X"
-  website: "https://github.com/jhkennedy"
-- family-names: "Lopez"
-  given-names: "Luis"
-  orcid: "https://orcid.org/0000-0003-4896-3263"
-  website: "https://github.com/betolink"
-- family-names: "Lowndes"
-  given-names: "Julia"
-  orcid: "https://orcid.org/0000-0003-1682-3872"
-  website: "https://github.com/jules32"
-- family-names: "Scheick"
-  given-names: "Jessica"
-  orcid: "https://orcid.org/0000-0002-3421-4459"
-  website: "https://github.com/JessicaS11"
-- family-names: "Steiker"
-  given-names: "Amy"
-  orcid: "https://orcid.org/0000-0002-3039-0260"
-  website: "https://github.com/asteiker"
+  - family-names: "Barrett"
+    given-names: "Andrew"
+    orcid: "https://orcid.org/0000-0003-4394-5445"
+    website: "https://github.com/andypbarrett"
+  - family-names: "Battisto"
+    given-names: "Chris"
+    orcid: "https://orcid.org/0000-0002-9608-3634"
+    website: "https://github.com/battistowx"
+  - family-names: "Bourbeau"
+    given-names: "James"
+    orcid: "https://orcid.org/0000-0003-2164-7789"
+    website: "https://github.com/jrbourbeau"
+  - family-names: "Fisher"
+    given-names: "Matt"
+    orcid: "https://orcid.org/0000-0003-3260-5445"
+    website: "https://mfisher87.github.io/"
+  - family-names: "Kaufman"
+    given-names: "Daniel"
+    orcid: "https://orcid.org/0000-0002-1487-7298"
+    website: "https://github.com/danielfromearth"
+  - family-names: "Kennedy"
+    given-names: "Joseph"
+    orcid: "https://orcid.org/0000-0002-9348-693X"
+    website: "https://github.com/jhkennedy"
+  - family-names: "Lopez"
+    given-names: "Luis"
+    orcid: "https://orcid.org/0000-0003-4896-3263"
+    website: "https://github.com/betolink"
+  - family-names: "Lowndes"
+    given-names: "Julia"
+    orcid: "https://orcid.org/0000-0003-1682-3872"
+    website: "https://github.com/jules32"
+  - family-names: "Scheick"
+    given-names: "Jessica"
+    orcid: "https://orcid.org/0000-0002-3421-4459"
+    website: "https://github.com/JessicaS11"
+  - family-names: "Steiker"
+    given-names: "Amy"
+    orcid: "https://orcid.org/0000-0002-3039-0260"
+    website: "https://github.com/asteiker"
 
 
 
 references:
-- type: "grant"
-  institution:
-    name: "National Aeronautics and Space Administration"
-  number: "20-TWSC20-2-0003"
+  - type: "grant"
+    title: "Openscapes: Supporting better science for future us"
+    institution:
+      name: "National Aeronautics and Space Administration"
+    number: "20-TWSC20-2-0003"
+    authors:
+      - family-names: "Lowndes"
+        given-names: "Julia"
+        orcid: "https://orcid.org/0000-0003-1682-3872"
+        website: "https://github.com/jules32"
+      - family-names: "Robinson"
+        given-names: "Erin"
+        orcid: "https://orcid.org/0000-0001-9998-0114"
+        website: "https://erinrobinson.info/"