diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 95a37e3ee..e6f877563 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "3.2.0"
+  ".": "4.0.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4abe5ba7..b9b3070ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,30 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
+## [4.0.0](https://github.com/philips-software/amp-embedded-infra-lib/compare/v3.2.0...v4.0.0) (2023-06-02)
+
+
+### ⚠ BREAKING CHANGES
+
+* security for MessageCommunication ([#294](https://github.com/philips-software/amp-embedded-infra-lib/issues/294))
+
+### Features
+
+* Add documentation ([#223](https://github.com/philips-software/amp-embedded-infra-lib/issues/223)) ([d710807](https://github.com/philips-software/amp-embedded-infra-lib/commit/d7108073d4bc139899bbffd0f46de487d5f591ad))
+* Merge upstream changes ([#279](https://github.com/philips-software/amp-embedded-infra-lib/issues/279)) ([9856f23](https://github.com/philips-software/amp-embedded-infra-lib/commit/9856f2304b818f69926db810aabadbd2c1a82659))
+* Security for MessageCommunication ([#294](https://github.com/philips-software/amp-embedded-infra-lib/issues/294)) ([f6c3f56](https://github.com/philips-software/amp-embedded-infra-lib/commit/f6c3f56e73a8324f87476908a1ef07f243350093))
+
+
+### Bug Fixes
+
+* Correct order of destruction in EchoForwarderToSerial. ([#291](https://github.com/philips-software/amp-embedded-infra-lib/issues/291)) ([3267831](https://github.com/philips-software/amp-embedded-infra-lib/commit/32678313eb79ee84165c358cb392e5915323ab64))
+* CucumberWireProtocolFormatter; max string value size does not fit into stepMatchArgumentsBuffer. ([#311](https://github.com/philips-software/amp-embedded-infra-lib/issues/311)) ([5504202](https://github.com/philips-software/amp-embedded-infra-lib/commit/55042025bfe5c631a2c247a6e90a23d0f437a2fb))
+* Ensure forwarding constructors have constraints ([#290](https://github.com/philips-software/amp-embedded-infra-lib/issues/290)) ([5015938](https://github.com/philips-software/amp-embedded-infra-lib/commit/50159383787e330ea784b684da5f6dfc47b49113))
+* GattClient notification ([#284](https://github.com/philips-software/amp-embedded-infra-lib/issues/284)) ([15ff387](https://github.com/philips-software/amp-embedded-infra-lib/commit/15ff3873f9f57169217c6a4337f9fac7d1b1f032))
+* Line termination mismatch in hex files ([#307](https://github.com/philips-software/amp-embedded-infra-lib/issues/307)) ([47482c3](https://github.com/philips-software/amp-embedded-infra-lib/commit/47482c3b02e76d13437413cfb802e317439a4300))
+* Remove superfluous > from cmake/emil_xsltproc.cmake ([#276](https://github.com/philips-software/amp-embedded-infra-lib/issues/276)) ([be139b2](https://github.com/philips-software/amp-embedded-infra-lib/commit/be139b22aff7dd5998eba2d7c409302598f988fb))
+* Usable memory loss in HttpClientBasic::Path ([#304](https://github.com/philips-software/amp-embedded-infra-lib/issues/304)) ([d5d4abf](https://github.com/philips-software/amp-embedded-infra-lib/commit/d5d4abf32050cf92bf7c55c5eb227007d04d88e3))
+
 ## [3.2.0](https://github.com/philips-software/amp-embedded-infra-lib/compare/v3.1.0...v3.2.0) (2023-04-21)
 
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 263f34236..34a1aacd3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ if (APPLE)
     set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 endif()
 
-project(emil LANGUAGES C CXX VERSION 3.2.0) # x-release-please-version
+project(emil LANGUAGES C CXX VERSION 4.0.0) # x-release-please-version
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED On)
diff --git a/documents/antora.yml b/documents/antora.yml
index a2928d929..8cd191ba9 100644
--- a/documents/antora.yml
+++ b/documents/antora.yml
@@ -1,5 +1,5 @@
 name: embedded_infrastructure_library
 title: Embedded Infrastructure Library documentation
-version: 3.2.0 # x-release-please-version
+version: 4.0.0 # x-release-please-version
 nav:
   - modules/ROOT/nav.adoc
diff --git a/protobuf/echo/protocol_buffer_echo.cmake b/protobuf/echo/protocol_buffer_echo.cmake
index 3c94e3fd7..ef1bf83bb 100644
--- a/protobuf/echo/protocol_buffer_echo.cmake
+++ b/protobuf/echo/protocol_buffer_echo.cmake
@@ -17,7 +17,7 @@ function(emil_fetch_echo_plugins)
         return()
     endif()
 
-    set(emil_version "3.2.0") # x-release-please-version
+    set(emil_version "4.0.0") # x-release-please-version
 
     if (CMAKE_HOST_WIN32)
         set(os_postfix "win64")
diff --git a/sonar-project.properties b/sonar-project.properties
index a8dcfae7e..c91e052d0 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -3,7 +3,7 @@ sonar.organization=philips-software
 
 sonar.projectName=embeddedinfralib
 # x-release-please-start-version
-sonar.projectVersion=3.2.0
+sonar.projectVersion=4.0.0
 # x-release-please-end
 
 sonar.links.homepage=https://github.com/philips-software/amp-embedded-infra-lib