diff --git a/ci-scripts/Jenkinsfile-GitLab-Docker b/ci-scripts/Jenkinsfile-GitLab-Docker
index 45ab3c3a365a9d321253db7f0d23be01aa5df777..3360aab66bea80fe6495b13b960992cdc3797717 100644
--- a/ci-scripts/Jenkinsfile-GitLab-Docker
+++ b/ci-scripts/Jenkinsfile-GitLab-Docker
@@ -330,6 +330,26 @@ pipeline {
           }  
         }
       }
+      post {
+        always {
+          script {
+            // Copy the pcaps and logs from the containers
+            sh "mkdir -p archives/pcaps archives/logs"
+            try {
+              sh 'docker cp cicd-oai-nrf:/tmp/nrf.pcap archives/pcaps/oai_nrf.pcap'
+              sh 'docker cp cicd-oai-nrf:/tmp/nrf.log archives/logs/oai_nrf.log'
+              sh 'docker cp cicd-oai-amf:/tmp/amf.pcap archives/pcaps/oai_amf.pcap'
+              sh 'docker cp cicd-oai-amf:/tmp/amf.log archives/logs/oai_amf.log'
+              sh 'docker cp cicd-oai-smf:/tmp/smf.pcap archives/pcaps/oai_smf.pcap'
+              sh 'docker cp cicd-oai-smf:/tmp/smf.log archives/logs/oai_smf.log'
+              sh 'docker cp cicd-oai-upf:/tmp/spgwu.pcap archives/pcaps/oai_spgwu.pcap'
+              sh 'docker cp cicd-oai-upf:/tmp/spgwu.log archives/logs/oai_spgwu.log'
+            } catch (Exception e) {
+              sh 'echo "Error in copying pcaps & logs from the containers"'
+            }
+          }
+        }
+      }
     }
     stage ('Undeploy 5G-CN') {
       steps {
diff --git a/ci-scripts/dsTesterDockerCompose/docker-compose.tplt b/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
index 51774c70aaff9356e0ada4afa21d835c2d2effcb..5f64c3d9053d9ee292d07d51a1bf9070b2b66396 100644
--- a/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
+++ b/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
@@ -29,6 +29,12 @@ services:
         ports:
             - 80
             - 9090
+        command: >
+            bash -c "nohup tshark -i eth0 -w /tmp/nrf.pcap 2>&1 > /dev/null &
+            /openair-nrf/bin/oai_nrf -c /openair-nrf/etc/nrf.conf -o | tee /tmp/nrf.log 2>&1
+            "
+        cap_add:
+            - NET_ADMIN
         environment:
             - TZ=Europe/Paris
             - NRF_INTERFACE_NAME_FOR_SBI=eth0
@@ -54,6 +60,12 @@ services:
         ports:
              - 38412
              - 80
+        command: >
+            bash -c "nohup tshark -i eth0 -w /tmp/amf.pcap 2>&1 > /dev/null &
+            /openair-amf/bin/oai_amf -c /openair-amf/etc/amf.conf -o | tee /tmp/amf.log 2>&1
+            "
+        cap_add:
+            - NET_ADMIN
         environment:
             - INSTANCE=1
             - PID_DIRECTORY=/var/run
@@ -119,6 +131,12 @@ services:
         ports:
             - 80
             - 9090
+        command: >
+            bash -c "nohup tshark -i eth0 -w /tmp/smf.pcap 2>&1 > /dev/null &
+            /openair-smf/bin/oai_smf -c /openair-smf/etc/smf.conf -o | tee /tmp/smf.log 2>&1
+            "
+        cap_add:
+            - NET_ADMIN
         environment:
             - TZ=Europe/Paris
             - INSTANCE=1
@@ -162,6 +180,10 @@ services:
         ports:
             - 2152
             - 8805
+        command: >
+            bash -c "nohup tshark -i eth0 -w /tmp/spgwu.pcap 2>&1 > /dev/null &
+            /openair-spgwu-tiny/bin/oai_spgwu -c /openair-spgwu-tiny/etc/spgw_u.conf -o | tee /tmp/spgwu.log 2>&1
+            "
         environment:
             - TZ=Europe/Paris
             - PID_DIRECTORY=/var/run