diff --git a/doc/architecture.md b/doc/architecture.md
new file mode 100644
index 0000000000000000000000000000000000000000..ef7fcf9a38faa9536fdd57260489b48507513c07
--- /dev/null
+++ b/doc/architecture.md
@@ -0,0 +1,5 @@
+<img src="../images/logos/OpenCAPIF.png" alt="drawing" width="200"/>
+
+# Architecture
+
+
diff --git a/doc/images/logo_osl.png b/doc/images/logo_osl.png
deleted file mode 100644
index e6eb89a7da94edc6ea26dcb1972d9e101b0dffee..0000000000000000000000000000000000000000
Binary files a/doc/images/logo_osl.png and /dev/null differ
diff --git a/doc/images/logo_osl_square.png b/doc/images/logo_osl_square.png
deleted file mode 100644
index 37cbc4ba60771e54c3ea2f18fa89a7e3af387360..0000000000000000000000000000000000000000
Binary files a/doc/images/logo_osl_square.png and /dev/null differ
diff --git a/doc/images/logo_osl_square_non_transp.png b/doc/images/logo_osl_square_non_transp.png
deleted file mode 100644
index a7f8684e95a987b15dacb02675bd3ac9ec7ed091..0000000000000000000000000000000000000000
Binary files a/doc/images/logo_osl_square_non_transp.png and /dev/null differ
diff --git a/doc/images/openslice_logo.png b/doc/images/openslice_logo.png
deleted file mode 100644
index 2fa5efc135209ce66cee07ea7a76dc0a4cff9244..0000000000000000000000000000000000000000
Binary files a/doc/images/openslice_logo.png and /dev/null differ
diff --git a/doc/images/openslice_logo_old.png b/doc/images/openslice_logo_old.png
deleted file mode 100644
index 61a38a515223bb67a78da6694c34dbe08c89e942..0000000000000000000000000000000000000000
Binary files a/doc/images/openslice_logo_old.png and /dev/null differ
diff --git a/doc/index.md b/doc/index.md
index 10d23eefdf17602dc64e7a329925172b647a3be9..8b61b159189480e697259e55b51aa87b07461364 100644
--- a/doc/index.md
+++ b/doc/index.md
@@ -1,51 +1,7 @@
 <img src="images/logos/OpenCAPIF.png" alt="drawing" width="200"/>
 
-# Release X.X.X-rc
 
-This release includes next changes:
-
-**New register flow to ensure:**
-
-  - isolation between CCF and Register services.
-  - Improve security, with split resposability between administrator operations and common user.
-
-**Improved Testing with Robot in order to cover:**
-
-  - New Register flows.
-  - Allow different URLs for register, ccf and vault services.
-
-**Improved security on DB:**
-
-  - Credentials requested to access mongo databases.
-  - Credentials requested also by mongo-express.
-
-**Scripts upgraded:**
-
-  - docker compose version 2 used on them.
-  - New cleaning script developed.
-
-**Cleanup of capif repository:**
-
-  - Documentation is now on splitted repository [OCF Documentation Repository]
-  - Test plan was moved to [OCF Documentation Repository]
-  - Obsolote data is removed.
-
-
-# Release 0.0
-
-The APIs included in Release 0.0 are:
-
-- JWT Authentication APIs
-- CAPIF Invoker Management API
-- CAPIF Publish API
-- CAPIF Discover API
-- CAPIF Security API
-- CAPIF Events API
-- CAPIF Provider Management API
-
-This Release also includes a Robot Test Suite for all those services and a Postman Test Suite for simple testing.
-
-## What is OpenCAPIF?
+# What is OpenCAPIF?
 
 OpenCAPIF is an open source implementation of the CAPIF Core Function APIs plus the logic and additional services required to fulfill the 3GPP requirements and deliver the expected functionality.
 
@@ -81,7 +37,7 @@ The following diagram shows how API Invokers and API Providers interact with the
 If you want to know more about OpenCAPIF check [The story behind openCAPIF](https://ocf.etsi.org/news/20240110_the_story_behind_opencapif/)
 
 
-## Repository structure
+# Repository structure
 
 You can check the code at [OpenCAPIF Repository]
 
@@ -101,21 +57,21 @@ CAPIF_API_Services
 * **tools**: Auxiliary tools. Robot Framework related code and OpenAPI scripts.
 * **test**: Tests developed using Robot Framework.
 
-## CAPIF_API_Services
+# CAPIF_API_Services
 
 This repository has the python-flask Mockup servers created with openapi-generator related with CAPIF APIS defined here:
 [Open API Descriptions of 3GPP 5G APIs]
 
 
-## How to test CAPIF APIs
+# How to test CAPIF APIs
 
 The above APIs can be tested either with POSTMAN tool or running the developed tests with Robot Framework.
 
-## Test Plan Documentation
+# Test Plan Documentation
 
 Complete documentation of tests is available here: [Test Plan Directory]
 
-## Robot Framework
+# Robot Framework
 
 In order to ensure that modifications over CAPIF services still fulfills the required functionality, the Robot Framework Test Suite must be successfully run.
 
@@ -123,15 +79,15 @@ The Robot Test Suite covers the requirements described in the test plan at [Test
 
 Please check the [Testing with Robot Framework] Section
 
-## Using PostMan
+# Using PostMan
 
 You can also test the CAPIF flow using the Postman tool. To do this, we have created a collection with some examples of CAPIF requests with everything necessary to carry them out.
 
 For more information on how to test the APIs with POSTMAN, go to this [POSTMAN Section].
 
-## Important urls:
+# Important urls:
 
-## Mongo CAPIF's DB Dashboard
+# Mongo CAPIF's DB Dashboard
 ```
 http://localhost:8082/ (if accessed from localhost) 
 
@@ -140,7 +96,7 @@ or
 http://<Mongo CAPIF Express Host IP>:8082/ (if accessed from another host)
 ```
 
-## Mongo Register's DB Dashboard
+# Mongo Register's DB Dashboard
 ```
 http://localhost:8083/ (if accessed from localhost) 
 
@@ -149,15 +105,12 @@ or
 http://<Mongo Register Express Host IP>:8083/ (if accessed from another host)
 ```
 
-## FAQ Documentation
+# FAQ Documentation
 
 Frequently asked questions can be found here: [FAQ Section]
 
 
 
-
-
-
 [Test Plan Directory]: ./testing/testplan/README.md  "Test Plan Directory"
 [Testing with Robot Framework]: ./testing/robotframework/README.md  "Testing with Robot Framework"
 [FAQ Section]: ./FAQ.md "FAQ Section"
diff --git a/doc/releasenotes.md b/doc/releasenotes.md
new file mode 100644
index 0000000000000000000000000000000000000000..90717e22658db0bdf24713e4142ad53b407e5c16
--- /dev/null
+++ b/doc/releasenotes.md
@@ -0,0 +1,45 @@
+# Release X.X.X-rc
+
+This release includes next changes:
+
+**New register flow to ensure:**
+
+  - isolation between CCF and Register services.
+  - Improve security, with split resposability between administrator operations and common user.
+
+**Improved Testing with Robot in order to cover:**
+
+  - New Register flows.
+  - Allow different URLs for register, ccf and vault services.
+
+**Improved security on DB:**
+
+  - Credentials requested to access mongo databases.
+  - Credentials requested also by mongo-express.
+
+**Scripts upgraded:**
+
+  - docker compose version 2 used on them.
+  - New cleaning script developed.
+
+**Cleanup of capif repository:**
+
+  - Documentation is now on splitted repository [OCF Documentation Repository]
+  - Test plan was moved to [OCF Documentation Repository]
+  - Obsolote data is removed.
+
+
+# Release 0.0
+
+The APIs included in Release 0.0 are:
+
+- JWT Authentication APIs
+- CAPIF Invoker Management API
+- CAPIF Publish API
+- CAPIF Discover API
+- CAPIF Security API
+- CAPIF Events API
+- CAPIF Provider Management API
+
+This Release also includes a Robot Test Suite for all those services and a Postman Test Suite for simple testing.
+
diff --git a/doc/testing/robotframework/README.md b/doc/testing/robotframework/README.md
index dfc697e2a089aa00b5c3b22ac267ddee78933e75..fad7717ec1ca73ee5e8d77eb3f1a799372f37de8 100644
--- a/doc/testing/robotframework/README.md
+++ b/doc/testing/robotframework/README.md
@@ -15,7 +15,7 @@ To run any test locally you will need *docker* and *docker-compose* installed in
 ## Script Test Execution
 This script will build robot docker image if it's need and execute tests selected by "include" option. Just go to service folder, execute and follow steps.
 ```
-./runCapifTests.sh --include <TAG>
+./run_capif_tests.sh --include <TAG>
 ```
 Results will be stored at <REPOSITORY_FOLDER>/results
 
@@ -24,9 +24,15 @@ Please check parameters (include) under *Test Execution* at [Manual Build And Te
 ### Mock Server
 Some tests on Test Plans require mockserver. That mock server must be deployed and reachable by Robot Framework and CCF under test.
 
+To run Mock Server locally you can just execute the next script:
+```
+cd services
+./run_mock_server.sh
+```
+
 If you want to launch only tests that not needed mockserver, just add "--exclude mockserver" parameter to robot execution:
 ```
-./runCapifTests.sh --include <TAG> --exclude mockserver
+./run_capif_tests.sh --include <TAG> --exclude mockserver
 ```
 
 ## Manual Build And Test Execution
diff --git a/mkdocs.yml b/mkdocs.yml
index fb0bbb0795b65f908e0f65c723d98b13c8381651..aa15c1ed66425563b17f5dfec62ef6604f47dc9b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -74,6 +74,8 @@ extra:
 nav:
   - Overview:
       - Introduction: index.md
+      - Release Notes: releasenotes.md
+      - Architecture: architecture.md
   - Getting Started:
       - How to Run: ./gettingstarted/howtorun.md
   - Testing: