diff --git a/ChangeLog b/ChangeLog
index fd35a9f3..1e0833fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 CHANGES
 =======
+
+4.0.0
+
 Upgrade Python (2 -> 3), #242
         Django (1.11 -> 2.2.24) #310
         DjangoRestFramework (3.9 -> 3.11) #309
diff --git a/Dockerfile b/Dockerfile
index 151809e1..4d7bc6bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ENV ORCHESTRATOR_USER orchestrator
 # By default all linux users non root, has a UID above 1000, so it's taken 10001 which would never end up allocated automatically.
 ENV ORCHESTRATOR_USER_UID 10001
 
-ENV ORCHESTRATOR_VERSION 3.8.0
+ENV ORCHESTRATOR_VERSION 4.0.0
 
 ENV python_lib /var/env-orchestrator/lib/python3.6/site-packages
 ENV DJANGO_SETTINGS_MODULE settings
diff --git a/setup.cfg b/setup.cfg
index 44bc5dc9..582485ca 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = iotp_orchestrator
-version = 3.8.0
+version = 4.0.0
 summary = IoT Platform Orchestrator
 description-file =
     README.md
diff --git a/sonar-project.properties b/sonar-project.properties
index c7a968fd..b04b00c0 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -2,7 +2,7 @@
 ############################ COMMON PROPERTIES
 sonar.projectName=Orchestrator
 sonar.projectKey=com.telefonica.iot:orchestrator
-sonar.projectVersion=3.8.0
+sonar.projectVersion=4.0.0
 
 ### SOURCES AND EXCLUSIONS
 sonar.sources=src