diff --git a/CITATION.cff b/CITATION.cff
index 345a402..f2afb66 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -1,28 +1,32 @@
-cff-version: 1.2.0
-message: "If you use this software, please cite it using these metadata."
-title: "pyJedAI: a lightsaber for Link Discovery"
+title: pyJedAI
+message: "If you use this software, please cite it as below."
 authors:
+- family-names: "Nikoletos"
+  given-names: "Konstantinos"
+  orcid: "https://orcid.org/0000-0003-3465-1197"
+- family-names: "Papadakis"
+  given-names: "George"
+  orcid: "https://orcid.org/0000-0002-7298-9431"
+- family-names: "Koubarakis"
+  given-names: "Manolis"
+title: "pyJedAI: a lightsaber for Link Discovery"
+url: "https://pyjedai.readthedocs.io/en/latest/intro.html"
+cff-version: 1.2.0
+license: Apache-2.0
+preferred-citation:
+  title: "pyJedAI: a lightsaber for Link Discovery"
+  type: conference-paper
+  authors:
   - family-names: "Nikoletos"
     given-names: "Konstantinos"
+    orcid: "https://orcid.org/0000-0003-3465-1197"
   - family-names: "Papadakis"
     given-names: "George"
+    orcid: "https://orcid.org/0000-0002-7298-9431"
   - family-names: "Koubarakis"
     given-names: "Manolis"
-doi: "10.13140/RG.2.2.12171.16160"
-date-released: "2022-10-01"
-license: "Apache-2.0"
-repository-code: "https://github.com/AI-team-UoA/pyJedAI"
-repository-artifact: "http://dx.doi.org/10.13140/RG.2.2.12171.16160"
-keyword: Link Discovery, Semantic Web, Python, ISWC2022
-cite-as:
-  - name: Demo at ISWC
-    bibtex: |
-      @inproceedings{nikoletos2022pyjedai,
-        title = {pyJedAI: a Lightsaber for Link Discovery},
-        author = {Nikoletos, Konstantinos and Papadakis, George and Koubarakis, Manolis},
-        booktitle = {Demo at {ISWC}},
-        year = {2022}
-      }
-  - name: "ISWC 2022"
-    doi: "10.13140/RG.2.2.12171.16160"
-  - name: "Konstantinos Nikoletos, George Papadakis, Manolis Koubarakis. (2022). pyJedAI: a lightsaber for Link Discovery. In International Semantic Web Conference 2022 - Posters, Demos and Industry Tracks."
+  collection-title: "Demo at International Semantic Web Conference." # booktitle
+  collection-type: "proceedings"
+  conference:
+    name: "ISWC" # series
+  year: 2022