diff --git a/src/tests/eucnc24/.gitlab-ci.yml b/src/tests/eucnc24/.gitlab-ci.yml
index 2cd5df8cb1186f72066e84964b24ba5fb5a8a2cc..e4d94edad78b436716b924e456761c0b9b9afb9f 100644
--- a/src/tests/eucnc24/.gitlab-ci.yml
+++ b/src/tests/eucnc24/.gitlab-ci.yml
@@ -118,6 +118,8 @@ end2end_test eucnc24:
       --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
       --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
       $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-onboarding.sh
+    - docker logs ${TEST_NAME} || true
+    - docker rm -f ${TEST_NAME} || true
 
     # Run end-to-end test: configure service TFS
     - >
@@ -125,6 +127,8 @@ end2end_test eucnc24:
       --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
       --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
       $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-tfs-service-create.sh
+    - docker logs ${TEST_NAME} || true
+    - docker rm -f ${TEST_NAME} || true
 
     # Run end-to-end test: test connectivity with ping
     - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.10'
@@ -139,6 +143,8 @@ end2end_test eucnc24:
       --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
       --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
       $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-tfs-service-remove.sh
+    - docker logs ${TEST_NAME} || true
+    - docker rm -f ${TEST_NAME} || true
 
     # Run end-to-end test: configure service IETF
     - >
@@ -146,6 +152,8 @@ end2end_test eucnc24:
       --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
       --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
       $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-ietf-service-create.sh
+    - docker logs ${TEST_NAME} || true
+    - docker rm -f ${TEST_NAME} || true
 
     # Run end-to-end test: test connectivity with ping
     - sudo containerlab exec --name eucnc24 --label clab-node-name=dc1 --cmd 'ping -n -c3 192.168.1.10'
@@ -160,6 +168,8 @@ end2end_test eucnc24:
       --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
       --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
       $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-ietf-service-remove.sh
+    - docker logs ${TEST_NAME} || true
+    - docker rm -f ${TEST_NAME} || true
 
     # Run end-to-end test: cleanup scenario
     - >
@@ -167,6 +177,8 @@ end2end_test eucnc24:
       --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
       --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
       $CI_REGISTRY_IMAGE/${TEST_NAME}:latest /var/teraflow/run-cleanup.sh
+    - docker logs ${TEST_NAME} || true
+    - docker rm -f ${TEST_NAME} || true
 
   after_script:
     # Dump TeraFlowSDN component logs