diff --git a/README.md b/README.md
index 7bbc7dba62379ed264ad1641c34a83735ed48da4..ac3ae504cc1221304e247c24d89c4a41c68b86e1 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,17 @@
 
 <p align="center">
     <a href="https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-OAI--Public--V1.1-blue" alt="License"></a>
+    <a href="https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-upf-vpp/-/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-Apache--2.0-blue" alt="License"></a>
+</p>
+
+<p align="center">
     <a href="https://jenkins-oai.eurecom.fr/job/OAI-CN5G-AMF/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FOAI-CN5G-AMF%2F&label=build%20AMF"></a>
     <a href="https://jenkins-oai.eurecom.fr/job/OAI-CN5G-NRF/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FOAI-CN5G-NRF%2F&label=build%20NRF"></a>
     <a href="https://jenkins-oai.eurecom.fr/job/OAI-CN5G-SMF/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FOAI-CN5G-SMF%2F&label=build%20SMF"></a>
     <a href="https://jenkins-oai.eurecom.fr/job/OAI-CN5G-AUSF/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FOAI-CN5G-AUSF%2F&label=build%20AUSF"></a>
     <a href="https://jenkins-oai.eurecom.fr/job/OAI-CN5G-UDM/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FOAI-CN5G-UDM%2F&label=build%20UDM"></a>
     <a href="https://jenkins-oai.eurecom.fr/job/OAI-CN5G-UDR/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FOAI-CN5G-UDR%2F&label=build%20UDR"></a>
+    <a href="https://jenkins-oai.eurecom.fr/job/OAI-CN5G-UPF-VPP/"><img src="https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fjenkins-oai.eurecom.fr%2Fjob%2FOAI-CN5G-UPF-VPP%2F&label=build%20UPF-VPP"></a>
 </p>
 
 <h2 align="center">
@@ -27,7 +32,10 @@ At the moment, it contains the following network elements:
 * Unified Data Repository (**[UDR](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-udr)**)
 * User Plane Function (**UPF**) with 2 variants:
   * Simple Implementation based on our 4G CUPS component (**[SPGWU-TINY](https://github.com/OPENAIRINTERFACE/openair-spgwu-tiny)**)
-  * VPP-Based Implementation (**UPF-VPP**)
+  * VPP-Based Implementation (**[UPF-VPP](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-upf-vpp)**)
+* Network Slicing Selection Function (**NSSF**)
+* Network Data Analytics Function (**NWDAF**)
+* Unstructured Data Storage Function (**UDSF**)
 
 Each has its own repository. Some of these repositories are still private, soon to be released.
 
@@ -48,6 +56,10 @@ See [OAI Website for more details](https://www.openairinterface.org/?page_id=698
 The text for `OAI Public License V1.1` is also available under [LICENSE](LICENSE)
 file at the root of this repository.
 
+Note that the `UPF-VPP` implementation is distributed under `Apache V2.0 License`.
+
+See [Apache Website for more details](http://www.apache.org/licenses/LICENSE-2.0).
+
 # Collaborative work
 
 This source code is managed through a GITLAB server, a collaborative development platform.
diff --git a/docs/DEPLOY_HOME.md b/docs/DEPLOY_HOME.md
index 49eb74a20abb69f7bc08e537bad1a9c269a11538..6f81a743c1ba2aaa6bb4d28ef399d9137bbbf3d4 100644
--- a/docs/DEPLOY_HOME.md
+++ b/docs/DEPLOY_HOME.md
@@ -19,6 +19,7 @@ Welcome to the tutorial home page of OAI 5g Core project. Here you can find lot
     - [Using Docker-Compose, perform a `minimalist` deployment](./DEPLOY_SA5G_MINI_DS_TESTER_DEPLOYMENT.md)
     - [Using Docker-Compose, perform a `basic` deployment](./DEPLOY_SA5G_BASIC_DS_TESTER_DEPLOYMENT.md)
     - [Using Docker-Compose, perform a `basic` deployment with FQDN feature](./DEPLOY_SA5G_BASIC_FQDN_DEPLOYMENT.md)
+    - [Using Docker-Compose, perform a `basic-vpp` deployment with VPP-implementation of UPF](./DEPLOY_SA5G_WITH_VPP_UPF.md)
     - [Using Helm Chart](./DEPLOY_SA5G_HC.md)
     - [Using Virtual Machine, deploy and test with a Commercial UE](./DEPLOY_SA5G_VM_COTSUE.md)
     - [Using Docker-Compose, perform a `minimalist` deployment and test with `gnbsim`](./DEPLOY_SA5G_WITH_GNBSIM.md)