diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..1f90230
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,26 @@
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+# Changelog for Resource Registry Context Client
+
+
+## [v4.0.0-SNAPSHOT] [r5.0.0] - 
+
+- Switched JSON management to gcube-jackson [#19116]
+
+
+## [v3.0.0] [r4.21.0] - 2020-03-30
+
+- Refactored code to support IS Model reorganization (e.g naming, packages)
+- Using gxREST in place of custom class of resource-regsitry-api [#11455]
+- Refactored code to support renaming of Embedded class to Property [#13274]
+
+
+## [v2.0.0] [r4.13.0] - 2018-11-20
+
+- Using new resource-registry REST interface [#11905]
+
+
+## [v1.0.0] [r4.9.0] - 2017-12-20
+
+- First Release [#10247]
+
diff --git a/changelog.xml b/changelog.xml
deleted file mode 100644
index d9ba53a..0000000
--- a/changelog.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xml>
-<ReleaseNotes>
-	<Changeset component="org.gcube.information-system.resource-registry-client.3-0-0" date="${buildDate}">
-		<Change>Refactored code to support IS Model reorganization (e.g naming, packages)</Change>
-		<Change>Using gxREST in place of custom class of resource-regsitry-api #11455</Change>
-		<Change>Refactored code to support renaming of Embedded class to Property #13274</Change>
-	</Changeset>
-	<Changeset component="org.gcube.information-system.resource-registry-client.2-0-0" date="2018-11-20">
-		<Change>Using new resource-registry REST interface #11905</Change>
-	</Changeset>
-	<Changeset component="org.gcube.information-system.resource-registry-client.1-0-0" date="2017-12-20">
-		<Change>First Release</Change>	
-	</Changeset>
-</ReleaseNotes>
\ No newline at end of file