diff --git a/ci-scripts/Jenkinsfile-GitLab-Load-Check b/ci-scripts/Jenkinsfile-GitLab-Load-Check
index b3c34999d4a87e65273321d2380f997883871587..ec38e99ee548bebde270672c3277beb9a66bfd0e 100644
--- a/ci-scripts/Jenkinsfile-GitLab-Load-Check
+++ b/ci-scripts/Jenkinsfile-GitLab-Load-Check
@@ -388,7 +388,7 @@ pipeline {
         }
       }
     }
-    stage ('Deploy OAI-CN5G in Basic-NRF - PDU Sess Est Test - HTTP2') {
+    stage ('Deploy OAI-CN5G in Basic-NRF - Deregistration Test - HTTP2') {
       steps {
         script {
           echo 'Silencing all NFs to reduce size of logs'
@@ -420,7 +420,7 @@ pipeline {
               sh 'docker-compose -f docker-compose-basic-nrf-http2.yaml stop -t 3'
             }
             sleep 5
-            retrieveLogs('archives/pdu-sess-est-test-http2', 'docker-compose/docker-compose-basic-nrf-http2.yaml')
+            retrieveLogs('archives/deregistration-http2', 'docker-compose/docker-compose-basic-nrf-http2.yaml')
             dir ('docker-compose') {
               sh 'docker-compose -f docker-compose-basic-nrf-http2.yaml down -t 3'
             }
@@ -430,16 +430,18 @@ pipeline {
       }
     }
     // PDU Session Establishment Test should not fail
-    stage ('PDU Session Establishment Test - HTTP2') {
+    stage ('Deregistration Test - HTTP2') {
       steps {
         script {
           dir ('ci-scripts/docker-compose/load-test-gnbsim') {
             sh 'sed -i -e "s@TEST_REGISTER@False@" -e "s@NB_REGISTRATIONS@10@" omec-gnbsim-config-*.yaml'
-            sh 'sed -i -e "s@TEST_PDU_SESSION@True@" -e "s@NB_PDU_SESSIONS@5@" omec-gnbsim-config-*.yaml'
+            sh 'sed -i -e "s@TEST_PDU_SESSION@True@" -e "s@NB_PDU_SESSIONS@125@" -e "s@pdusessest@deregister@" omec-gnbsim-config-*.yaml'
             sh 'docker-compose -f docker-compose-omec-gnbsim.yaml up -d'
-            sh '../../checkOmecGnbsimStatus.py --timeout 120'
+            // One UE takes 3.7 seconds to finish (3 seconds for the traffic test)
+            // 125 UE x 3.7 = 460 seconds (ie 8 minutes)
+            sh '../../checkOmecGnbsimStatus.py --timeout 500'
           }
-          retrieveGnbsimLogs('archives/pdu-sess-est-test-http2', 'ci-scripts/docker-compose/load-test-gnbsim')
+          retrieveGnbsimLogs('archives/deregistration-http2', 'ci-scripts/docker-compose/load-test-gnbsim')
           dir ('ci-scripts/docker-compose/load-test-gnbsim') {
             sh 'docker-compose -f docker-compose-omec-gnbsim.yaml down -t 0'
           }
@@ -448,7 +450,7 @@ pipeline {
       post {
         unsuccessful {
           script {
-            retrieveGnbsimLogs('archives/pdu-sess-est-test-http2', 'ci-scripts/docker-compose/load-test-gnbsim')
+            retrieveGnbsimLogs('archives/deregistration-http2', 'ci-scripts/docker-compose/load-test-gnbsim')
             dir ('ci-scripts/docker-compose/load-test-gnbsim') {
               sh 'docker-compose -f docker-compose-omec-gnbsim.yaml down -t 0'
             }
@@ -456,7 +458,7 @@ pipeline {
               sh 'docker-compose -f docker-compose-basic-nrf-http2.yaml stop -t 3'
             }
             sleep 5
-            retrieveLogs('archives/pdu-sess-est-test-http2', 'docker-compose/docker-compose-basic-nrf-http2.yaml')
+            retrieveLogs('archives/deregistration-http2', 'docker-compose/docker-compose-basic-nrf-http2.yaml')
             dir ('docker-compose') {
               sh 'docker-compose -f docker-compose-basic-nrf-http2.yaml down -t 3'
             }
@@ -465,14 +467,14 @@ pipeline {
         }
       }
     }
-    stage ('Undeploy OAI-CN5G - PDU Sess Est Test - HTTP2') {
+    stage ('Undeploy OAI-CN5G - Deregistration Test - HTTP2') {
       steps {
         script {
           dir ('docker-compose') {
             sh 'docker-compose -f docker-compose-basic-nrf-http2.yaml stop -t 3'
           }
           sleep 5
-          retrieveLogs('archives/pdu-sess-est-test-http2', 'docker-compose/docker-compose-basic-nrf-http2.yaml')
+          retrieveLogs('archives/deregistration-http2', 'docker-compose/docker-compose-basic-nrf-http2.yaml')
           dir ('docker-compose') {
             sh 'docker-compose -f docker-compose-basic-nrf-http2.yaml down -t 3'
           }
diff --git a/ci-scripts/checkLoadTestHtmlReport.py b/ci-scripts/checkLoadTestHtmlReport.py
index cb639b14f761f1436bc18fd9b5994f65629c3cf7..c35efe3b6d81919d2272eb891988bb33c2670092 100755
--- a/ci-scripts/checkLoadTestHtmlReport.py
+++ b/ci-scripts/checkLoadTestHtmlReport.py
@@ -58,7 +58,7 @@ class HtmlReport():
             wfile.write(generate_header(args))
             loadTests = [('Registration', 'registration-test'), \
                          ('PDU Session Establishment', 'pdu-sess-est-test'),
-                         ('PDU Session Establishment - HTTP2', 'pdu-sess-est-test-http2')]
+                         ('Deregistration - HTTP2', 'deregistration-http2')]
             for (testName, testPath) in loadTests:
                 wfile.write(self.testSummary(testName, testPath))
             wfile.write(generate_footer())
diff --git a/docker-compose/docker-compose-basic-nonrf.yaml b/docker-compose/docker-compose-basic-nonrf.yaml
index c17cad2cecf116bae876069eeaea4b49cd81e7f1..d33eeee689fa542e9c686f08a5cbb9c3a9f21deb 100644
--- a/docker-compose/docker-compose-basic-nonrf.yaml
+++ b/docker-compose/docker-compose-basic-nonrf.yaml
@@ -75,7 +75,7 @@ services:
         container_name: "oai-amf"
         image: oaisoftwarealliance/oai-amf:develop
         environment:
-            - TZ=Europe/paris
+            - TZ=Europe/Paris
             - MCC=208
             - MNC=95
             - REGION_ID=128
diff --git a/docker-compose/docker-compose-basic-nrf.yaml b/docker-compose/docker-compose-basic-nrf.yaml
index 6f16ef24059f3435d07411799e6a802f3e0e3a18..5b12a86bed9f75782e6e725f0be2df5dddbe97bc 100644
--- a/docker-compose/docker-compose-basic-nrf.yaml
+++ b/docker-compose/docker-compose-basic-nrf.yaml
@@ -91,7 +91,7 @@ services:
         container_name: "oai-amf"
         image: oaisoftwarealliance/oai-amf:develop
         environment:
-            - TZ=Europe/paris
+            - TZ=Europe/Paris
             - MCC=208
             - MNC=95
             - REGION_ID=128
diff --git a/docker-compose/docker-compose-basic-vpp-nonrf.yaml b/docker-compose/docker-compose-basic-vpp-nonrf.yaml
index 7073b6ad452e5288cfbd7e4b6c37af4b4b661a70..0c9d6118d1eba0a630f1064780ad34ca2160266a 100644
--- a/docker-compose/docker-compose-basic-vpp-nonrf.yaml
+++ b/docker-compose/docker-compose-basic-vpp-nonrf.yaml
@@ -75,7 +75,7 @@ services:
         container_name: "oai-amf"
         image: oaisoftwarealliance/oai-amf:develop
         environment:
-            - TZ=Europe/paris
+            - TZ=Europe/Paris
             - MCC=208
             - MNC=95
             - REGION_ID=128
diff --git a/docker-compose/docker-compose-basic-vpp-nrf-http2.yaml b/docker-compose/docker-compose-basic-vpp-nrf-http2.yaml
index d273abf32e9abd7dabf4b42749099163ac45bcda..8180cb0fa704fc4ed0c7d1a23ec90e2640b1f280 100644
--- a/docker-compose/docker-compose-basic-vpp-nrf-http2.yaml
+++ b/docker-compose/docker-compose-basic-vpp-nrf-http2.yaml
@@ -117,7 +117,7 @@ services:
             - 8080/tcp
             - 38412/sctp
         environment:
-            - TZ=Europe/paris
+            - TZ=Europe/Paris
             - MCC=208
             - MNC=95
             - REGION_ID=128
diff --git a/docker-compose/docker-compose-basic-vpp-nrf.yaml b/docker-compose/docker-compose-basic-vpp-nrf.yaml
index 77c3d71e375f8d3ff422fe24e359f6fb95525ae4..499171ba4b0f4b0c8b71b29e697580a039f95474 100644
--- a/docker-compose/docker-compose-basic-vpp-nrf.yaml
+++ b/docker-compose/docker-compose-basic-vpp-nrf.yaml
@@ -91,7 +91,7 @@ services:
         container_name: "oai-amf"
         image: oaisoftwarealliance/oai-amf:develop
         environment:
-            - TZ=Europe/paris
+            - TZ=Europe/Paris
             - MCC=208
             - MNC=95
             - REGION_ID=128
diff --git a/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml b/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml
index 0c5fd1953a79c358cffe95085d36ceacdd7c2dee..b0ed2deabf255a52da7ad0ffcc6dc2440563f98c 100644
--- a/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml
+++ b/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml
@@ -117,7 +117,7 @@ services:
         container_name: "oai-amf"
         image: oaisoftwarealliance/oai-amf:develop
         environment:
-            - TZ=Europe/paris
+            - TZ=Europe/Paris
             - INSTANCE=0
             - PID_DIRECTORY=/var/run
             - MCC=208
diff --git a/docker-compose/docker-compose-mini-nonrf.yaml b/docker-compose/docker-compose-mini-nonrf.yaml
index 66ea8b9a63b4cb01324da0e27899b67333277a54..bae1182f8707857700477791b4e01619e137a949 100644
--- a/docker-compose/docker-compose-mini-nonrf.yaml
+++ b/docker-compose/docker-compose-mini-nonrf.yaml
@@ -24,7 +24,7 @@ services:
         container_name: "oai-amf"
         image: oaisoftwarealliance/oai-amf:develop
         environment:
-            - TZ=Europe/paris
+            - TZ=Europe/Paris
             - MCC=208
             - MNC=95
             - REGION_ID=128
diff --git a/docker-compose/docker-compose-mini-nrf.yaml b/docker-compose/docker-compose-mini-nrf.yaml
index 7f6cb11a815383688f7d5ab7f148c702c5b681b9..0e733ff330b1fb8dcea22a02bc0cb182c3e86471 100644
--- a/docker-compose/docker-compose-mini-nrf.yaml
+++ b/docker-compose/docker-compose-mini-nrf.yaml
@@ -33,7 +33,7 @@ services:
         container_name: "oai-amf"
         image: oaisoftwarealliance/oai-amf:develop
         environment:
-            - TZ=Europe/paris
+            - TZ=Europe/Paris
             - MCC=208
             - MNC=95
             - REGION_ID=128
diff --git a/docker-compose/docker-compose-no-privilege.yaml b/docker-compose/docker-compose-no-privilege.yaml
index 55481df263b27ff8151c5dbf42f0cb76bff9d501..2071cf62ba28edd0fb9b99abdcbcb19ef0901e83 100644
--- a/docker-compose/docker-compose-no-privilege.yaml
+++ b/docker-compose/docker-compose-no-privilege.yaml
@@ -34,7 +34,7 @@ services:
         container_name: "oai-amf"
         image: oaisoftwarealliance/oai-amf:develop
         environment:
-            - TZ=Europe/paris
+            - TZ=Europe/Paris
             - MCC=208
             - MNC=95
             - REGION_ID=128
diff --git a/docker-compose/docker-compose-slicing-basic-nrf.yaml b/docker-compose/docker-compose-slicing-basic-nrf.yaml
index ba47af29704c053eed910f42292f8fca1fbc0c64..fad247ebcfdceff310268942a7499b30c605c0f0 100644
--- a/docker-compose/docker-compose-slicing-basic-nrf.yaml
+++ b/docker-compose/docker-compose-slicing-basic-nrf.yaml
@@ -138,7 +138,7 @@ services:
         container_name: oai-amf
         image: oaisoftwarealliance/oai-amf:develop
         environment:
-            - TZ=Europe/paris
+            - TZ=Europe/Paris
             - INSTANCE=0
             - PID_DIRECTORY=/var/run
             - MCC=208