diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 8fc00bec6..000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,10 +0,0 @@
-* [Steve Crouch](https://github.com/steve-crouch)
-* [Aleksandra Nenadic](https://github.com/anenadic)
-* [James Graham](https://github.com/jag1g13)
-* [Martin Robinson](https://github.com/martinjrobins)
-* [Sam Mangham](https://github.com/smangham)
-* [Jacalyn Laird](https://github.com/JacalynLaird)
-* [Thomas Kiley](https://github.com/thomaskileyukaea)
-* [Matthew Bluteau](https://github.com/bielsnohr)
-* [Sven van der Burg](https://github.com/svenvanderburg)
-* [Giulia Crocioni](https://github.com/gcroci2)
diff --git a/CITATION.cff b/CITATION.cff
new file mode 100644
index 000000000..58f0ff44e
--- /dev/null
+++ b/CITATION.cff
@@ -0,0 +1,129 @@
+# This CITATION.cff file was generated with cffinit.
+# Visit https://bit.ly/cffinit to generate yours today!
+
+cff-version: 1.2.0
+title: Intermediate Research Software Development Skills (Python)
+message: >-
+  If you use this dataset, please cite it using the metadata
+  from this file.
+type: dataset
+authors:
+  - given-names: Aleksandra
+    family-names: Nenadic
+    orcid: 'https://orcid.org/0000-0002-2269-3894'
+  - given-names: Steve
+    family-names: Crouch
+    orcid: 'https://orcid.org/0000-0001-8985-6814'
+  - given-names: Thomas
+    family-names: Kiley
+  - given-names: Raniere
+    family-names: Silva
+  - given-names: François
+    family-names: Michonneau
+  - given-names: Maxim
+    family-names: Belkin
+  - given-names: James
+    family-names: Graham
+  - given-names: Greg
+    family-names: Wilson
+  - given-names: Matthew
+    family-names: Bluteau
+    orcid: 'https://orcid.org/0000-0001-9498-8475'
+  - given-names: Toby
+    family-names: Hodges
+  - given-names: Zhian
+    family-names: Kamvar
+  - given-names: Sven
+    family-names: Burg
+    name-particle: van der
+    orcid: 'https://orcid.org/0000-0003-1250-6968'
+  - given-names: Abby
+    family-names: Cabunoc Mayes
+  - given-names: Martin
+    family-names: Robinson
+  - given-names: Sam
+    family-names: Mangham
+  - given-names: Jacalyn
+    family-names: Laird
+  - given-names: Sarah
+    family-names: Stevens
+  - given-names: Katrin
+    family-names: Leinweber
+  - given-names: Erin
+    family-names: Becker
+  - given-names: João
+    family-names: Rodrigues
+  - given-names: Douglas
+    family-names: Lowe
+    orcid: 'https://orcid.org/0000-0002-1248-3594'
+  - given-names: Aman
+    family-names: Goel
+  - given-names: Matthew M.
+    family-names: Graham
+    orcid: 'https://orcid.org/0000-0001-9104-7960'
+  - given-names: Devaraj
+    family-names: Gopinathan
+    orcid: 'https://orcid.org/0000-0002-0490-3229'
+  - given-names: Jaro
+    family-names: Camphuijsen
+    orcid: 'https://orcid.org/0000-0002-8928-7831'
+  - given-names: Giulia
+    family-names: Crocioni
+    orcid: 'https://orcid.org/0000-0002-0823-0121'
+  - given-names: William
+    family-names: Close
+  - given-names: Frank
+    family-names: Löffler
+  - given-names: Sander
+    family-names: Rijn
+    name-particle: van
+  - given-names: Harry
+    family-names: Saunders
+  - given-names: Matthew
+    family-names: Field
+  - given-names: Sanket
+    family-names: Gadgil
+  - given-names: Kristian
+    family-names: Zarębski
+  - given-names: Kingsley
+    family-names: Collie
+  - given-names: Tom
+    family-names: Neep
+  - given-names: Renato
+    family-names: Alves
+  - given-names: Daniel
+    family-names: Katz
+  - given-names: Jen
+    family-names: Reeve
+  - given-names: G.K.
+    family-names: Murphy
+  - given-names: Yuriy
+    family-names: Sverchkov
+  - given-names: S.
+    family-names: Hartley
+  - given-names: Olexandr
+    family-names: Konovalov
+  - given-names: Jonathan
+    family-names: Guyer
+identifiers:
+  - type: doi
+    value: 10.5281/zenodo.6532056
+    description: Zenodo
+repository-code: >-
+  https://github.com/carpentries-incubator/python-intermediate-development
+url: >-
+  https://carpentries-incubator.github.io/python-intermediate-development/
+abstract: >-
+  This is an intermediate-level course in collaborative
+  research software engineering and development skills,
+  using Python as an example language. It teaches these
+  skills in a way that mimics a typical software development
+  process working as a part of a team, starting from an
+  existing piece of software.
+keywords:
+  - Python
+  - Software Development
+  - Carpentries
+license: CC-BY-4.0
+version: beta-July2025
+date-released: '2025-07-30'
diff --git a/CITATION.md b/CITATION.md
deleted file mode 100644
index 272385194..000000000
--- a/CITATION.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Cite as:
-
-Aleksandra Nenadic, Steve Crouch, Thomas Kiley, Raniere Silva, François Michonneau, Maxim Belkin, James Graham, Greg Wilson, Matthew Bluteau, Toby Hodges, Zhian N. Kamvar, Sven van der Burg, Abby Cabunoc Mayes, JacalynLaird, Sarah Stevens, Katrin Leinweber, Erin Becker, João Rodrigues, Douglas Lowe, Aman Goel, Matt Graham, Deveraj Gopinathan, Jaro Camphuijsen, … William L. Close. (2024). carpentries-incubator/python-intermediate-development: beta-Nov2024 (beta-Nov2024). Zenodo. https://doi.org/10.5281/zenodo.16606960
diff --git a/README.md b/README.md
index 92ac9ed2c..edd8d119a 100644
--- a/README.md
+++ b/README.md
@@ -97,7 +97,7 @@ under the [MIT licence][mit-license]. For more information, see [LICENSE.md](LIC
 
 ## Citation
 
-To cite this lesson, please consult with [CITATION](CITATION).
+To cite this lesson, please consult [CITATION.cff](CITATION.cff).
 
 ## Contact
 
diff --git a/paper.bib b/paper.bib
index 523432940..bdf8af465 100644
--- a/paper.bib
+++ b/paper.bib
@@ -1,6 +1,8 @@
-@misc{ssi-international-rse-survey-2018,
-  title={SSI International RSE Survey 2018: What do we know about RSEs?},
-  author={Philippe, Olivier and Hammitzsch, Martin and Janosch, Stephan and van der Walt, Anelda and van Werkhoven, Ben and Hettrick, Simon and Katz, Daniel S. and Leinweber, Katrin and Gesing, Sandra and Druskat, Stephan and Henwood, Scott and May, Nicholas R. and Lohani, Nooriyah P. and Sinha, Manodeep}
-  year={2018},
-  url={https://zenodo.org/records/2585783}
-}
+@misc{Nenadic_Intermediate_Research_Software_2025,
+author = {Nenadic, Aleksandra and Crouch, Steve and Kiley, Thomas and Silva, Raniere and Michonneau, François and Belkin, Maxim and Graham, James and Wilson, Greg and Bluteau, Matthew and Hodges, Toby and Kamvar, Zhian and van der Burg, Sven and Cabunoc Mayes, Abby and Robinson, Martin and Mangham, Sam and Laird, Jacalyn and Stevens, Sarah and Leinweber, Katrin and Becker, Erin and Rodrigues, João and Lowe, Douglas and Goel, Aman and Graham, Matthew M. and Gopinathan, Devaraj and Camphuijsen, Jaro and Crocioni, Giulia and Close, William and Löffler, Frank and van Rijn, Sander and Saunders, Harry and Field, Matthew and Gadgil, Sanket and Zarębski, Kristian and Collie, Kingsley and Neep, Tom and Alves, Renato and Katz, Daniel and Reeve, Jen and Murphy, G.K. and Sverchkov, Yuriy and Hartley, S. and Konovalov, Olexandr and Guyer, Jonathan},
+month = jul,
+title = {{Intermediate Research Software Development Skills (Python)}},
+url = {https://github.com/carpentries-incubator/python-intermediate-development},
+year = {2025},
+doi = {10.5281/zenodo.16606960}
+}
\ No newline at end of file