diff --git a/Proxy/installation.md b/Proxy/installation.md
index c1bfcff2b1327013527ae410100cacd5c7efaf47..ec99beb53ee5748361825d2291720b6955646d05 100644
--- a/Proxy/installation.md
+++ b/Proxy/installation.md
@@ -3,7 +3,7 @@ title:  Installation Manual
 subtitle: Gazelle Proxy
 author: Guillaume THOMAZON
 date: 26/03/2019
-toolversion: 4.7.0
+toolversion: 5.0.0
 function: Engineer
 version: 2.01
 status: Approved document
@@ -50,24 +50,28 @@ cp gazelle-proxy-ear/target/gazelle-proxy.ear /usr/local/jboss7/standalone/deplo
 4.  **WARNING** : From version 4.7.0, datasources have been extracted from the **ear**. The template file can be found in /src/main/application/datasource in the source or in the file gazelle-proxy-X.X.X-datasource.zip from the nexus.
 For more informations about how to manage that externalization, please refer to [general considerations for JBoss7](https://gazelle.ihe.net/gazelle-documentation/General/jboss7.html).
 
-```
-Datasource name : gazelle-proxyDS
 
-Database name : gazelle-proxy
-```
-4.  Start Jboss AS 7
+* Datasource name : gazelle-proxyDS
+
+* Database name : gazelle-proxy
+
+5.  Start Jboss AS 7
 ```bash
 sudo /etc/init.d/jboss7 start
 ```
 
-5.  Execute the sql script available in your workspace at gazelle-proxy-ear/src/main/sql/init.sql
+6.  Execute the sql script available in your workspace at gazelle-proxy-ear/src/main/sql/schema-5.0.0.sql
+```bash
+psql -U gazelle gazelle-proxy < schema-5.0.0.sql
+```
+7.  Execute the sql script available in your workspace at gazelle-proxy-ear/src/main/sql/init-5.0.0.sql
 ```bash
-psql -U gazelle gazelle-proxy < init.sql
+psql -U gazelle gazelle-proxy < init-5.0.0.sql
 ```
 
-6.  Open your favorite browser (we recommand Chrome or Firefox) and go to [*http://yourServer:8080/proxy*](http://yourServer:8080/proxy)
+8.  Open your favorite browser (we recommand Chrome or Firefox) and go to [*http://yourServer:8080/proxy*](http://yourServer:8080/proxy)
 
-7.  The proxy is now up and running, see the next section for information on the configuration.
+9.  The proxy is now up and running, see the next section for information on the configuration.
 
 This new instance of the proxy is running without the CAS feature, that means that anyone accessing the tool has the administrator privileges.
 
@@ -104,4 +108,4 @@ There is a set of properties that you can configure on the Configuration page, t
 | **proxy\_oid**                       | For each tool, we need an OID which uniquely identify the instance of the tool and the URL used to send back results.                                                                                                                          | 1.1.1.1.1                                                                                                                                 |
 | **storage\_dicom**                   | Absolute path to the system folder used to store the DICOM datasets                                                                                                                                                                            | /opt/proxy/DICOM                                                                                                                          |
 | **time\_zone**                       | The time zone used to display the timestamps                                                                                                                                                                                                   | Europe/Paris                                                                                                                              |
-| **admin_only_mode**                  | This preference is used to enable/disable the Admin Only mode. This mode restricts the access to messages list and messages details to admin only. Connection can however be shared by an administrator to allow users knowing the connection privacy key to see messages from the connection. | false
\ No newline at end of file
+| **admin_only_mode**                  | This preference is used to enable/disable the Admin Only mode. This mode restricts the access to messages list and messages details to admin only. Connection can however be shared by an administrator to allow users knowing the connection privacy key to see messages from the connection. | false
diff --git a/Proxy/release-note.md b/Proxy/release-note.md
index db52b5f707f50cab7cf08ef916b776f7e43ffa2d..2a6d0e26d741b4851096ef1364da6612ecacdf84 100644
--- a/Proxy/release-note.md
+++ b/Proxy/release-note.md
@@ -1,14 +1,33 @@
 ---
 title: Release note
-subtitle: Proxy - 4.7.1
-toolversion: 4.7.1
-releasedate: 2020-11-12
+subtitle: Proxy - 5.0.0
+toolversion: 5.0.0
+releasedate: 2021-06-06
 author: Anne-Gaëlle BERGE
 function: Software Engineer
 customer: IHE Europe
 reference: KER1-RNO-IHE-Proxy
 ---
 
+# 5.0.0
+_Release date: 2021-06-01 : Major version for TLS support_
+
+__Improvement__
+* \[[PROXY-216](https://gazelle.ihe.net/jira/browse/PROXY-216)\] Create secured channel 
+* \[[PROXY-217](https://gazelle.ihe.net/jira/browse/PROXY-217)\] Manage TLS protocol versions 
+* \[[PROXY-218](https://gazelle.ihe.net/jira/browse/PROXY-218)\] Manage cipher-suites 
+* \[[PROXY-219](https://gazelle.ihe.net/jira/browse/PROXY-219)\] Display cipher-suites compatibility with TLS protocols 
+* \[[PROXY-225](https://gazelle.ihe.net/jira/browse/PROXY-225)\] Manage channel Truststore V1 (JVM) 
+* \[[PROXY-226](https://gazelle.ihe.net/jira/browse/PROXY-226)\] Enable/disable mutual authentication 
+* \[[PROXY-227](https://gazelle.ihe.net/jira/browse/PROXY-227)\] Download channels backup (CSV file) 
+* \[[PROXY-228](https://gazelle.ihe.net/jira/browse/PROXY-228)\] Upload channels backup (CSV file) 
+* \[[PROXY-229](https://gazelle.ihe.net/jira/browse/PROXY-229)\] Filter secured or not secured messages 
+* \[[PROXY-231](https://gazelle.ihe.net/jira/browse/PROXY-231)\] Secured channel details 
+* \[[PROXY-232](https://gazelle.ihe.net/jira/browse/PROXY-232)\] Secured message details 
+* \[[PROXY-233](https://gazelle.ihe.net/jira/browse/PROXY-233)\] Persistence of secured connections 
+* \[[PROXY-234](https://gazelle.ihe.net/jira/browse/PROXY-234)\] Ease secured channels visibility 
+* \[[PROXY-237](https://gazelle.ihe.net/jira/browse/PROXY-237)\] Manage server keystore V1 (JVM) 
+
 # 4.7.1
 _Release date: 2020-11-12_
 
diff --git a/Proxy/user.md b/Proxy/user.md
index 6c30b0f61533a3ac56988474293e1461f9f6d86d..f503e5c6369938b67cb3e5565043347fc4752b39 100644
--- a/Proxy/user.md
+++ b/Proxy/user.md
@@ -3,7 +3,7 @@ title:  User Manual
 subtitle: Gazelle Proxy
 author: Guillaume THOMAZON
 date: 07/10/2016
-toolversion: 4.7.0
+toolversion: 5.0.0
 function: Engineer
 version: 2.01
 status: Approved document
@@ -13,7 +13,7 @@ customer: IHE-EUROPE
 
 # Project Overview
 
-The proxy is used to capture TCP/IP packets exchanged by test participants. The packed flow is analyzed and stored in a database for further analysis by protocol specific analysers.
+The proxy is used to capture TCP/IP packets exchanged by test participants using secured or not secured channel. The packed flow is analyzed and stored in a database for further analysis by protocol specific analysers.
 
 The packet analyser availables are :
 * HTTP  
diff --git a/Test-Management/admin.md b/Test-Management/admin.md
index bcdcbe6ecde937d7444b3480856023231ccb08e7..c1ff541fee603d46787f09e5d3f18d75b4fba05d 100644
--- a/Test-Management/admin.md
+++ b/Test-Management/admin.md
@@ -4,7 +4,7 @@ subtitle: Gazelle Test Management
 author: Guillaume THOMAZON
 function: Engineer
 releasedate: 19/10/2020
-toolversion: 5.14.x
+toolversion: 6.0.0
 version: 1.02
 status: Approved document
 reference: KER1-MAN-IHE-TEST_MANAGEMENT_ADMIN-1_02
diff --git a/Test-Management/installation.md b/Test-Management/installation.md
index 1d7178a43c7a4c1785bbae4b2ef06911b4ed3f16..23bb270b97d37ca910ad2ea291e629ddc99de915 100755
--- a/Test-Management/installation.md
+++ b/Test-Management/installation.md
@@ -4,7 +4,7 @@ subtitle: Gazelle Test Management
 author: Nicolas BAILLIET
 function: Engineer
 releasedate: 18/05/2021
-toolversion: 5.16.x
+toolversion: 6.0.0
 version: 1.02
 status: Approved document
 reference: KER1-MAN-IHE-TEST_MANAGEMENT_INSTALLATION-1_02
diff --git a/Test-Management/release-note.md b/Test-Management/release-note.md
index 0d740ac989b8cd3309f20084fc81673d504f0f7d..03eaf8b4be6df35f8a715c34d2aad4bc28cc3bf7 100644
--- a/Test-Management/release-note.md
+++ b/Test-Management/release-note.md
@@ -1,7 +1,7 @@
 ---
 title: Release note
 subtitle: Test Management
-toolversion: 5.16.0
+toolversion: 6.0.0
 releasedate: 2021-05-18
 author: Anne-Gaëlle BERGE
 function: Software Engineer
@@ -9,17 +9,24 @@ customer: IHE Europe
 reference: KER1-RNO-IHE-TEST_MANAGEMENT
 ---
 
+# 6.0.0
+_Release date: 2021-06-01_
+
+** Story
+* \[[GZL-4971](https://gazelle.ihe.net/jira/browse/GZL-4971)\] - Request Proxy for secured proxy port V1 
+* \[[GZL-4972](https://gazelle.ihe.net/jira/browse/GZL-4972)\] - Open Proxy secured channel V1 
+
 # 5.16.0
 _Release date: 2021-05-18_
 
 ** Story
-* \[[GZL-4956](https://gazelle.ihe.net/jira/browse/GZL-4956)\] - - External test report publication in test instance
-* \[[GZL-4957](https://gazelle.ihe.net/jira/browse/GZL-4957)\] -- Token for uploading files must have a validity period
-* \[[GZL-4958](https://gazelle.ihe.net/jira/browse/GZL-4958)\] - - Prevent upload of logs and report in "finished" test instance
-* \[[GZL-4960](https://gazelle.ihe.net/jira/browse/GZL-4960)\] - - Show a green or red icon next to a test-report in a test instance.
+* \[[GZL-4956](https://gazelle.ihe.net/jira/browse/GZL-4956)\] - External test report publication in test instance
+* \[[GZL-4957](https://gazelle.ihe.net/jira/browse/GZL-4957)\] - Token for uploading files must have a validity period
+* \[[GZL-4958](https://gazelle.ihe.net/jira/browse/GZL-4958)\] - Prevent upload of logs and report in "finished" test instance
+* \[[GZL-4960](https://gazelle.ihe.net/jira/browse/GZL-4960)\] - Show a green or red icon next to a test-report in a test instance.
 
 ** Improvement
-* \[[GZL-4959](https://gazelle.ihe.net/jira/browse/GZL-4959)\] - - Add comment in chat room at token generation and any upload (Audit).
+* \[[GZL-4959](https://gazelle.ihe.net/jira/browse/GZL-4959)\] - Add comment in chat room at token generation and any upload (Audit).
 
 
 # 5.15.0
diff --git a/Test-Management/user.md b/Test-Management/user.md
index 05dd0b4c0da71c23dd302247d0453bd43d7a0aed..ed6679f16192d43733e8e64a8b33ac3115275ebc 100644
--- a/Test-Management/user.md
+++ b/Test-Management/user.md
@@ -4,7 +4,7 @@ subtitle: Gazelle Test Management
 author: Guillaume THOMAZON
 function: Engineer
 releasedate: 18/05/2021
-toolversion: 5.16.x
+toolversion: 6.0.0
 version: 2.01
 status: To be verified
 reference: KER1-MAN-IHE-TEST_MANAGEMENT_USER-2_01