diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ecbaa4..82b3c45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-## [v2.8.5-SNAPSHOT] - 2022-03-17
+## [v2.8.5] - 2022-03-17
- Fix for #21652 Some keys contain the context and some other (the VRE contextes) contains in the context name.
diff --git a/pom.xml b/pom.xml
index 0df661d..6ae5ade 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
org.gcube.portlets.admin
rmp-common-library
- 2.8.5-SNAPSHOT
+ 2.8.5
Resource Management Library
gCube Resource Management Library is a common library containing shared code for Information System Operations
@@ -38,7 +38,7 @@
org.gcube.distribution
maven-portal-bom
- 3.6.3-SNAPSHOT
+ 3.6.3
pom
import