diff --git a/CHANGELOG.md b/CHANGELOG.md
index e656860b44d6abbe9777eb719b33e65e9c73b4fd..055f42b84b95c20f32ceca1869a805359411b1d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # RELEASE NOTES: #
 
+## v2.0.0 -- December 2023 ##
+
+* Features
+  - Support YAML configuration file
+    * Yaml validation default value
+* Fixes
+  - Handling boolean values in yaml parsing for policies
+* Tech debt
+  - Moved common models to the shared common submodule
+  - Moved PCF Models to the shared common submodule
+  - Switching to clang-format-12
+  - Published image on Docker-Hub is using now Ubuntu-22 as base image
+    * Ubuntu-18 is no longer supported
+
 ## v1.5.1 -- May 2023 ##
 
 * Add HTTP/2 support
diff --git a/README.md b/README.md
index f858d517ffb5b66c65cc37ef25d9c0503d761db3..2f669fe188dfe6888098e53509c6c7175e5c791a 100644
--- a/README.md
+++ b/README.md
@@ -10,15 +10,17 @@ At the moment, it contains the following network elements:
 
 * Access and Mobility Management Function (**AMF**)
 * Authentication Server Management Function (**AUSF**)
+* Location Management Function (**LMF**)
+* Network Exposure Function (**NEF**)
+* Network Slicing Selection Function (**NSSF**)
 * Network Repository Function (**NRF**)
+* Network Data Analytics Function (**NWDAF**)
+* Policy Control Function (**PCF**)
 * Session Management Function (**SMF**)
 * Unified Data Management (**UDM**)
 * Unified Data Repository (**UDR**)
-* User Plane Function (**UPF**)
-* Network Slicing Selection Function (**NSSF**)
-* Network Data Analytics Function (**NWDAF**)
 * Unstructured Data Storage Function (**UDSF**)
-* Policy Control Function (**PCF**)
+* User Plane Function (**UPF**)
 
 Each has its own repository: this repository (`oai-cn5g-pcf`) is meant for PCF.