diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
index 3b99cda05..e69de29bb 100644
--- a/CHANGES_NEXT_RELEASE
+++ b/CHANGES_NEXT_RELEASE
@@ -1,3 +0,0 @@
-[cygnus-common] Upgrade postgresql from 42.4.3 to 42.7.2
-[cygnus-common] [arcgis] Fix: check feature attributes containsKey before get it (#2347)
-[cygnus-ngsi] [arcgis-sink] Set always uniqueField from aggregator for all features (#2349)
diff --git a/cygnus-common/pom.xml b/cygnus-common/pom.xml
index 983396eb6..0d2addf4c 100644
--- a/cygnus-common/pom.xml
+++ b/cygnus-common/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-common</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-common</name>
diff --git a/cygnus-common/spec/SPECS/cygnus-common.spec b/cygnus-common/spec/SPECS/cygnus-common.spec
index b7a40638b..20244f866 100644
--- a/cygnus-common/spec/SPECS/cygnus-common.spec
+++ b/cygnus-common/spec/SPECS/cygnus-common.spec
@@ -172,6 +172,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Mon Mar 4 2024 Alvaro Vega <alvaro.vegagarcia@telefonica.com> 3.6.0
+- [cygnus-common] [arcgis] Fix: check feature attributes containsKey before get it (#2347)
+- [cygnus-common] Upgrade postgresql from 42.4.3 to 42.7.2
+
 * Fri Feb 9 2024 Alvaro Vega <alvaro.vegagarcia@telefonica.com> 3.5.0
 - [cygnus-common][cygnus-ngsi][cygnus-ngsi-ld] Upgrade in source code to support Java 17 build
 - [cygnus-common] [Arcgis] All NGSI DateTime are translated to Millis from Epoch (esriFieldTypeDate) (#2339)
diff --git a/cygnus-ngsi-ld/pom.xml b/cygnus-ngsi-ld/pom.xml
index f90dc6aa8..20b970d89 100644
--- a/cygnus-ngsi-ld/pom.xml
+++ b/cygnus-ngsi-ld/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-ngsi-ld</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-ngsi-ld</name>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>3.5.0-SNAPSHOT</version>
+            <version>3.6.0</version>
         </dependency>
     </dependencies>
 
diff --git a/cygnus-ngsi/pom.xml b/cygnus-ngsi/pom.xml
index 4bab40d80..54cc620b8 100644
--- a/cygnus-ngsi/pom.xml
+++ b/cygnus-ngsi/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-ngsi</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-ngsi</name>
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>3.5.0-SNAPSHOT</version>
+            <version>3.6.0</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.jodd/jodd-util -->
         <dependency>
diff --git a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec
index 436432956..86767d2d0 100644
--- a/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec
+++ b/cygnus-ngsi/spec/SPECS/cygnus-ngsi.spec
@@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_project_install_dir}
 
 %changelog
+* Mon Mar 4 2024 Alvaro Vega <alvaro.vegagarcia@telefonica.com> 3.6.0
+- [cygnus-ngsi] [arcgis-sink] Set always uniqueField from aggregator for all features (#2349)
+
 * Fri Feb 9 2024 Alvaro Vega <alvaro.vegagarcia@telefonica.com> 3.5.0
 - [cygnus-ngsi] Upgrade mockito-core dep from 5.5.0 to 5.10.0
 - [cygnus-ngsi] Upgrade Java version from 1.11 to 1.17 in Dockerfile (#2297, #2304)
diff --git a/cygnus-twitter/pom.xml b/cygnus-twitter/pom.xml
index 1e3235265..0dbf534f4 100644
--- a/cygnus-twitter/pom.xml
+++ b/cygnus-twitter/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.telefonica.iot</groupId>
     <artifactId>cygnus-twitter</artifactId>
-    <version>3.5.0-SNAPSHOT</version>
+    <version>3.6.0</version>
     <packaging>jar</packaging>
 
     <name>cygnus-twitter</name>
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>com.telefonica.iot</groupId>
             <artifactId>cygnus-common</artifactId>
-            <version>3.5.0-SNAPSHOT</version>
+            <version>3.6.0</version>
         </dependency>
         <!-- Required by twitter agent -->
         <dependency>
diff --git a/docker/cygnus-common/Dockerfile b/docker/cygnus-common/Dockerfile
index 4d867026b..2ec8a8606 100644
--- a/docker/cygnus-common/Dockerfile
+++ b/docker/cygnus-common/Dockerfile
@@ -27,7 +27,7 @@ MAINTAINER Francisco Romero Bueno <francisco.romerobueno@telefonica.com>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "3.5.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.6.0"
 ENV CYGNUS_CONF_PATH "/opt/apache-flume/conf"
 ENV CYGNUS_CONF_FILE "/opt/apache-flume/conf/agent.conf"
 ENV CYGNUS_AGENT_NAME "cygnus-common"
@@ -40,7 +40,7 @@ ENV CYGNUS_API_PORT "8081"
 # PR https://github.com/telefonicaid/fiware-cygnus/pull/1801 should be also done in this Dockerfile
 # NOTE: Configure correctly GIT_URL_CYGNUS and GIT_REV_CYGNUS for each git branch/fork used
 ENV GIT_URL_CYGNUS "https://github.com/telefonicaid/fiware-cygnus.git"
-ENV GIT_REV_CYGNUS "master"
+ENV GIT_REV_CYGNUS "release/3.6.0"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"
diff --git a/docker/cygnus-ngsi-ld/Dockerfile b/docker/cygnus-ngsi-ld/Dockerfile
index b5bca2f0b..08e731b9e 100644
--- a/docker/cygnus-ngsi-ld/Dockerfile
+++ b/docker/cygnus-ngsi-ld/Dockerfile
@@ -27,7 +27,7 @@ ARG GITHUB_REPOSITORY=fiware-cygnus
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "3.5.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.6.0"
 ENV CYGNUS_CONF_PATH "/opt/apache-flume/conf"
 ENV CYGNUS_CONF_FILE "/opt/apache-flume/conf/agent.conf"
 ENV CYGNUS_AGENT_NAME "cygnus-ngsi-ld"
diff --git a/docker/cygnus-ngsi/Dockerfile b/docker/cygnus-ngsi/Dockerfile
index 230ec4b50..1fb6c9af9 100644
--- a/docker/cygnus-ngsi/Dockerfile
+++ b/docker/cygnus-ngsi/Dockerfile
@@ -23,7 +23,7 @@ ARG GITHUB_REPOSITORY=fiware-cygnus
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "3.5.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.6.0"
 ENV CYGNUS_CONF_PATH "/opt/apache-flume/conf"
 ENV CYGNUS_CONF_FILE "/opt/apache-flume/conf/agent.conf"
 ENV CYGNUS_AGENT_NAME "cygnus-ngsi"
diff --git a/docker/cygnus-twitter/Dockerfile b/docker/cygnus-twitter/Dockerfile
index 1e08efcef..e417c2277 100644
--- a/docker/cygnus-twitter/Dockerfile
+++ b/docker/cygnus-twitter/Dockerfile
@@ -27,7 +27,7 @@ MAINTAINER Javi Palanca <jpalanca@dsic.upv.es>
 # Environment variables
 ENV CYGNUS_USER "cygnus"
 ENV CYGNUS_HOME "/opt/fiware-cygnus"
-ENV CYGNUS_VERSION "3.5.0-SNAPSHOT"
+ENV CYGNUS_VERSION "3.6.0"
 ENV CYGNUS_CONF_PATH "/opt/apache-flume/conf"
 ENV CYGNUS_CONF_FILE "/opt/apache-flume/conf/agent.conf"
 ENV CYGNUS_AGENT_NAME "cygnus-twitter"
@@ -39,7 +39,7 @@ ENV CYGNUS_JAVA_OPTS "-Xms2048m -Xmx4096m"
 # PR https://github.com/telefonicaid/fiware-cygnus/pull/1801 should be also done in this Dockerfile
 # NOTE: Configure correctly GIT_URL_CYGNUS and GIT_REV_CYGNUS for each git branch/fork used
 ENV GIT_URL_CYGNUS "https://github.com/telefonicaid/fiware-cygnus.git"
-ENV GIT_REV_CYGNUS "master"
+ENV GIT_REV_CYGNUS "release/3.6.0"
 
 ENV MVN_VER "3.5.4"
 ENV MVN_TGZ "apache-maven-${MVN_VER}-bin.tar.gz"