diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index adc2dc1bbd2936711c1f7b5bd5b6f8311fbac305..aaf77a3775e86614190d55088b21a86a76faa373 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -3,4 +3,4 @@
 All contributions to and interactions surrounding this project will abide by
 the [USGS Code of Scientific Conduct][1].
 
-[1]: https://www2.usgs.gov/fsp/fsp_code_of_scientific_conduct.asp
+[1]: https://www.usgs.gov/about/organization/science-support/office-science-quality-and-integrity/code-scientific-conduct
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e2c64d33161b6662d0600caf0674b17c42ff7ff1..818e22a39f18150cc4139d56b2b0916207cb88da 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,6 +10,6 @@ If you have direct contributions you would like considered for incorporation
 into the project you can [fork this repository][2] and
 [submit a merge request][3] for review.
 
-[1]: https://code.usgs.gov/ghsc/nshmp/nshm-hawaii/issues
+[1]: https://code.usgs.gov/ghsc/nshmp/nshm-hawaii/-/issues
 [2]: https://docs.gitlab.com/ee/gitlab-basics/fork-project.html
 [3]: https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html
diff --git a/LICENSE.md b/LICENSE.md
index b3f44156f3eb8c84848a331a7517b30118ce8f0f..b2c7f0d8098170d22c81eca2386e138c78e08e90 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -4,15 +4,14 @@ Unless otherwise noted, this project is in the public domain in the United
 States because it contains materials that originally came from the United
 States Geological Survey, an agency of the United States Department of
 Interior. For more information, see the official USGS copyright policy at
-[https://www2.usgs.gov/visual-id/credit_usgs.html#copyright](https://www2.usgs.gov/visual-id/credit_usgs.html#copyright)
+<https://www.usgs.gov/information-policies-and-instructions/copyrights-and-credits>.
 
 Additionally, we waive copyright and related rights in the work
 worldwide through the CC0 1.0 Universal public domain dedication.
 
 ## CC0 1.0 Universal Summary
 
-This is a human-readable summary of the
-[Legal Code (read the full text)](https://creativecommons.org/publicdomain/zero/1.0/legalcode).
+This is a human-readable summary of the [Legal Code (read the full text)][1].
 
 ### No Copyright
 
@@ -35,3 +34,5 @@ this deed makes no warranties about the work, and disclaims liability for
 all uses of the work, to the fullest extent permitted by applicable law.
 When using or citing the work, you should not imply endorsement by the
 author or the affirmer.
+
+[1]: https://creativecommons.org/publicdomain/zero/1.0/legalcode
diff --git a/README.md b/README.md
index 37fbbf080667ce98a99016e0638d89f6464792f7..deae174278884041dc3a8f35983b3647532a5415 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,16 @@
 # NSHM: Hawaiʻi
 
-National seismic hazard model (NSHM) for the state of Hawaiʻi. The latest version of this model is 2.0[TODO link to tag] released in 2021. This model is intended for use with USGS hazard software [*nshmp-haz*](https://code.usgs.gov/ghsc/nshmp/nshmp-haz). For details on the format of this model, see the [user guide and implementation reference](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/docs).
+National Seismic Hazard Model (NSHM) for the state of Hawaiʻi. This model is intended for use with
+U.S. Geological Survey (USGS) hazard software [*nshmp-haz-v2*][1].
 
-For prior models, see the [U.S. Seismic Hazard Maps – Hawaii](https://www.usgs.gov/natural-hazards/earthquake-hazards/science/us-seismic-hazard-maps-hawaii?qt-science_center_objects=0#qt-science_center_objects) data release.
+For details on the format of this model, see the
+[*nshmp-haz-v2* user guide and implementation reference][2].
+
+For prior models, see the [U.S. Seismic Hazard Maps – Hawaii][3] data release.
 
 ## Model Notes
 
-All NSHM Hawaii sources are assigned to the top-level `volcanic` tectonic setting. NSHM Hawaii source ID numbers are in the range 5000-5999 (see [nshm-fault-sections Numbering](https://code.usgs.gov/ghsc/nshmp/nshm-fault-sections/-/blob/master/docs/Contents.md)).
+All NSHM Hawaii sources are assigned to the top-level `volcanic` tectonic setting. NSHM Hawaii source ID numbers are in the range 5000-5999 (see [nshm-fault-sections Numbering][4]).
 
 ### Source and region IDs
 
@@ -25,3 +29,8 @@ zone-sources/caldera    | Caldera Collapse        | 5050
 ## References
 
 Petersen, M.D, Shumway, A.M., Powers, P.M., Moschetti, M.P., Llenos, A.L., Michael, A.J., Mueller, C.S., Frankel, A.D., Rezaeian, S., Rukstales, K.S., McNamara. D.E., Okubo, P.G., Zeng, Y., Jaiswal, K.S.,, Ahdi, S.K., Altekruse, J.M., and Shiro, B.R., 2021, 2021 U.S. National Seismic Hazard Model for the State of Hawaii, Earthquake Spectra, in press.
+
+[1]: https://code.usgs.gov/ghsc/nshmp/nshmp-haz
+[2]: https://code.usgs.gov/ghsc/nshmp/nshmp-haz-v2/-/tree/master/docs
+[3]: https://www.usgs.gov/natural-hazards/earthquake-hazards/science/us-seismic-hazard-maps-hawaii?qt-science_center_objects=0#qt-science_center_objects
+[4]: https://code.usgs.gov/ghsc/nshmp/nshm-fault-sections/-/blob/master/docs/Contents.md
diff --git a/code.json b/code.json
index b712f3d42567b8f9c8298f8f5ddad22862b53fec..3fe8088207caaa6611439bb4134fd51fa7dd6b14 100644
--- a/code.json
+++ b/code.json
@@ -5,6 +5,8 @@
     "description": "National Seismic Hazard Model (NSHM): Hawaii",
     "version": "#.#",
     "status": "Production",
+    "doi": "doi:###TBD###",
+
     "permissions": {
       "usageType": "openSource",
       "licenses": [
@@ -14,16 +16,20 @@
         }
       ]
     },
-    "homepageURL": "https://code.usgs.gov/ghsc/nshmp/nshm-hawaii/-/tree/#.#",
-    "downloadURL": "https://code.usgs.gov/ghsc/nshmp/nshm-hawaii/-/archive/#.#/nshm-hawaii-#.#.zip",
-    "disclaimerURL": "https://code.usgs.gov/ghsc/nshmp/nshm-hawaii/-/raw/#.#/DISCLAIMER.md",
-    "repositoryURL": "https://code.usgs.gov/ghsc/nshmp/nshm-hawaii.git",
+
+    "repositoryURL": "https://code.usgs.gov/ghsc/nshmp/nshm-hawaii",
+    "homepageURL": "https://code.usgs.gov/ghsc/nshmp/nshm-hawaii",
+    "downloadURL": "https://code.usgs.gov/ghsc/nshmp/nshm-hawaii/-/releases/tag/v#.#.#",
+    "disclaimerURL": "https://code.usgs.gov/ghsc/nshmp/nshm-hawaii/-/blob/main/DISCLAIMER.md",
     "vcs": "git",
+
     "laborHours": 300,
-    "languages": [ 
-      "json" 
-    ],
+
+    "languages": [ "json" ],
+
     "tags": [
+      "Earthquake Hazards",
+      "Geologic Hazards Science Center",
       "psha",
       "nshmp-haz",
       "seismic-hazard",
@@ -33,10 +39,12 @@
       "earthquake-source-characterization",
       "doi|###TBD###"
     ],
+
     "contact": {
       "name": "Peter Powers",
       "email": "pmpowers@usgs.gov"
     },
+
     "date": {
       "metadataLastUpdated": "2021-06-##"
     }