diff --git a/CITATION.cff b/CITATION.cff
index 3b07a391a..b5dbda98b 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -1,38 +1,36 @@
-cff-version: 1.2.0
-title: >-
-  Krylov.jl: A Julia Basket of Hand-Picked Krylov Methods
-message: >-
-  If you use this software, please cite it using the
-  metadata from this file.
-type: software
+cff-version: "1.2.0"
 authors:
-  - given-names: Alexis
-    family-names: Montoison
-    email: alexis.montoison@polymtl.ca
-    affiliation: >-
-      GERAD and Department of Mathematics and
-      Industrial Engineering, Polytechnique Montréal,
-      QC, Canada.
-    orcid: 'https://orcid.org/0000-0002-3403-5450'
-  - given-names: Dominique
-    family-names: Orban
-    email: dominique.orban@gerad.ca
-    orcid: 'https://orcid.org/0000-0002-8017-7687'
-    affiliation: >-
-      GERAD and Department of Mathematics and
-      Industrial Engineering, Polytechnique Montréal,
-      QC, Canada
-identifiers:
-  - description: Zenodo archive
-    type: doi
-    value: 10.5281/zenodo.822073
-keywords:
-  - Julia
-  - linear algebra
-  - Krylov methods
-  - Krylov processes
-  - sparse linear systems
-  - GPU computing
-license: MPL-2.0
-repository-code: >-
-  https://github.com/JuliaSmoothOptimizers/Krylov.jl
+- family-names: Montoison
+  given-names: Alexis
+  orcid: "https://orcid.org/0000-0002-3403-5450"
+- family-names: Orban
+  given-names: Dominique
+  orcid: "https://orcid.org/0000-0002-8017-7687"
+contact:
+- family-names: Montoison
+  given-names: Alexis
+  orcid: "https://orcid.org/0000-0002-3403-5450"
+doi: 10.5281/zenodo.8310030
+message: If you use this software, please cite our article in the
+  Journal of Open Source Software.
+preferred-citation:
+  authors:
+  - family-names: Montoison
+    given-names: Alexis
+    orcid: "https://orcid.org/0000-0002-3403-5450"
+  - family-names: Orban
+    given-names: Dominique
+    orcid: "https://orcid.org/0000-0002-8017-7687"
+  date-published: 2023-09-26
+  doi: 10.21105/joss.05187
+  issn: 2475-9066
+  issue: 89
+  journal: Journal of Open Source Software
+  publisher:
+    name: Open Journals
+  start: 5187
+  title: "Krylov.jl: A Julia basket of hand-picked Krylov methods"
+  type: article
+  url: "https://joss.theoj.org/papers/10.21105/joss.05187"
+  volume: 8
+title: "Krylov.jl: A Julia basket of hand-picked Krylov methods"
diff --git a/README.md b/README.md
index 57bcd1d81..d55dc71f9 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Krylov.jl: A Julia basket of hand-picked Krylov methods
 
-| **Documentation** | **Linux/macOS/Windows/FreeBSD** | **Coverage** | **DOI** | **Downloads** |
+| **Documentation** | **CI** | **Coverage** | **DOI** | **Downloads** |
 |:-----------------:|:-------------------------------:|:------------:|:-------:|:-------------:|
 | [![docs-stable][docs-stable-img]][docs-stable-url] [![docs-dev][docs-dev-img]][docs-dev-url] | [![build-gh][build-gh-img]][build-gh-url] [![build-cirrus][build-cirrus-img]][build-cirrus-url] | [![codecov][codecov-img]][codecov-url] | [![doi][doi-img]][doi-url] | [![downloads][downloads-img]][downloads-url] |
 
@@ -14,14 +14,14 @@
 [build-cirrus-url]: https://cirrus-ci.com/github/JuliaSmoothOptimizers/Krylov.jl
 [codecov-img]: https://codecov.io/gh/JuliaSmoothOptimizers/Krylov.jl/branch/main/graph/badge.svg
 [codecov-url]: https://app.codecov.io/gh/JuliaSmoothOptimizers/Krylov.jl
-[doi-img]: https://img.shields.io/badge/DOI-10.5281%2Fzenodo.822073-blue.svg
-[doi-url]: https://doi.org/10.5281/zenodo.822073
+[doi-img]: https://joss.theoj.org/papers/10.21105/joss.05187/status.svg
+[doi-url]: https://doi.org/10.21105/joss.05187
 [downloads-img]: https://shields.io/endpoint?url=https://pkgs.genieframework.com/api/v1/badge/Krylov
 [downloads-url]: https://pkgs.genieframework.com?packages=Krylov
 
 ## How to Cite
 
-If you use Krylov.jl in your work, please cite using the format given in [`CITATION.bib`](https://github.com/JuliaSmoothOptimizers/Krylov.jl/blob/main/CITATION.bib).
+If you use Krylov.jl in your work, please cite using the format given in [`CITATION.cff`](https://github.com/JuliaSmoothOptimizers/Krylov.jl/blob/main/CITATION.cff).
 
 ## Content