diff --git a/CITATION.cff b/CITATION.cff
index 8ac5b62e..744f3a51 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -134,9 +134,11 @@ authors:
 - affiliation: NCAS and STFC
   family-names: Massey
   given-names: Neil
-- affiliation: University of Cantabria
+  orcid: 0000-0003-1211-1341
+- affiliation: Instituto de Fisica de Cantabria, CSIC-UC
   family-names: "Cofi\xF1o"
-  given-names: Antonio
+  given-names: Antonio S.
+  orcid: 0000-0001-7719-979X
 - affiliation: NCAR
   family-names: McGinnis
   given-names: Seth
diff --git a/Makefile b/Makefile
index 5cd0ef4a..a7714a4c 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,11 @@ REMOTE_URL=`git config remote.$TRACKING_REMOTE.url`
 FINAL_TAG ?= -a draft -a revnumber=v1.12.0-rc7-24-gb724218 -a revremark=${LOCAL_BRANCH}
 endif
 
+ifdef CF_FINAL_DATE
+DATE_DOCPROD != LC_ALL=C date -u -d "$(CF_FINAL_DATE)" "$(DATE_FORMAT)"
+else
 DATE_DOCPROD != LC_ALL=C date -u "$(DATE_FORMAT)"
+endif
 
 .PHONY: all clean images authors html pdf conventions-html conventions-pdf conventions conformance-html conformance-pdf conformance
 all: authors images html pdf 
diff --git a/README.md b/README.md
index b290e6c0..7dc9e7af 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,8 @@ The following steps outline how to build the CF Conventions documentation into H
       `make conformance`
    - Remove built documents and clean build directories:
       `make clean`
-   - Build with the FINAL tag and a date stamp. Ensure you have manually updated the version in the `version.adoc` file before running this command:
-      `make CF_FINAL=True`
+   - Build with the FINAL tag and a date stamp. Ensure you have manually updated the version in the `version.adoc` file before running this command. For FINAL builds, the release date must be provided explicitly:
+      `make CF_FINAL=True CF_FINAL_DATE=YYYY-MM-DD`
 
 Both HTML documents will have images embedded within `.html` file.
 
diff --git a/about-authors.adoc b/about-authors.adoc
index 1ca58fd6..0e6b3020 100644
--- a/about-authors.adoc
+++ b/about-authors.adoc
@@ -35,6 +35,6 @@
 * Thomas Lavergne, MET Norway
 * Bryan Lawrence, NCAS and University of Reading
 * Neil Massey, NCAS and STFC
-* Antonio Cofiño, University of Cantabria
+* Antonio S. Cofiño, Instituto de Fisica de Cantabria, CSIC-UC
 * Seth McGinnis, NCAR
 * Patrick Van Laake, Independent consultant
diff --git a/authors.adoc b/authors.adoc
index 08c45773..a3d04c60 100644
--- a/authors.adoc
+++ b/authors.adoc
@@ -113,11 +113,11 @@
 
 :author_34: Neil{nbsp}Massey
 :author_34_affiliation: NCAS and STFC
-:author_33_orcid: 0000-0003-1211-1341
+:author_34_orcid: 0000-0003-1211-1341
 
-:author_35: Antonio{nbsp}Cofiño
-:author_35_affiliation: University of Cantabria
-:author_33_orcid: 0000-0001-7719-979X
+:author_35: Antonio{nbsp}S.{nbsp}Cofiño
+:author_35_affiliation: Instituto de Fisica de Cantabria, CSIC-UC
+:author_35_orcid: 0000-0001-7719-979X
 
 :author_36: Seth{nbsp}McGinnis
 :author_36_affiliation: NCAR
diff --git a/history.adoc b/history.adoc
index 5dfc555b..89f4fa0e 100644
--- a/history.adoc
+++ b/history.adoc
@@ -129,7 +129,7 @@
 * {issues}186[Issue #186]: Minor corrections to Example 5.10, Section 9.5 & Appendix F
 * {issues}136[Issue #136]: Missing trajectory dimension in H.22
 * {issues}144[Issue #144]: Add <<groups, support for using groups>>.
-* {issues}128[Issue #128]: Add definition of 'name_strlen' dimension where missing in Appendix H CDL examples.
+* {pull-requests}128[Pull request #128]: Add definition of 'name_strlen' dimension where missing in Appendix H CDL examples.
 * {pull-requests}142[Pull request #142]: Fix bad reference to an example in section 6.1 "Labels".
 * {issues}155[Issue #155], {issues}156[Issue #156]: Allow alternate grid mappings for geometry containers. When node_count attribute is missing, require the dimension of the node coordinate variables to be one of the dimensions of the data variable.
 * {pull-requests}146[Pull request #146]: Typos (plural dimensions) in section H
diff --git a/zenodo.json b/zenodo.json
index 51feb8d7..6fa2a7fe 100644
--- a/zenodo.json
+++ b/zenodo.json
@@ -160,8 +160,9 @@
         "affiliation": "NCAS and STFC"
       },
       {
-        "name": "Cofi\u00f1o, Antonio",
-        "affiliation": "University of Cantabria"
+        "name": "Cofi\u00f1o, Antonio S.",
+        "affiliation": "Instituto de Fisica de Cantabria, CSIC-UC",
+        "orcid": "0000-0001-7719-979X"
       },
       {
         "name": "McGinnis, Seth",