diff --git a/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml b/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
index e20717651be2be1ed4666f1ead099b8929429f38..b757e184f271e2a6a6942543bbc037560d189396 100644
--- a/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
+++ b/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
@@ -28,6 +28,7 @@ end2end_test ofc25_camara_agg_net:
     - docker buildx build -t "${TEST_NAME}:latest" -f ./src/tests/${TEST_NAME}/Dockerfile .
     - docker buildx build -t "${IP_NAME}:latest" -f ./src/tests/tools/mock_ietf_l3vpn_sdn_ctrl/Dockerfile ./src/tests/tools/mock_ietf_l3vpn_sdn_ctrl
     - docker rm -f ${TEST_NAME} || true
+    - docker rm -f ${IP_NAME} || true
     - docker run -d --name ${IP_NAME} -p ${IP_PORT}:8443 $CI_REGISTRY_IMAGE/${IP_NAME}:latest
 
   script:
@@ -73,6 +74,9 @@ end2end_test ofc25_camara_agg_net:
     # Destroy Scenario
     - kubectl delete namespaces tfs || true
 
+    - docker rm -f ${TEST_NAME} || true
+    - docker rm -f ${IP_NAME} || true
+
     # Clean old docker images
     - docker images --filter="dangling=true" --quiet | xargs -r docker rmi
 
diff --git a/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml b/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml
index 9b07bd0215d6c9ffe1a166d646481915067d6ae6..571d3ddeaf88f67c89d265570bd3b1be96df139e 100644
--- a/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml
+++ b/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml
@@ -33,6 +33,8 @@ end2end_test ofc25_camara_e2e:
     - docker buildx build -t "${NCE_NAME}:latest" -f ./src/tests/tools/mock_nce_ctrl/Dockerfile ./src/tests/tools/mock_nce_ctrl
     - docker buildx build -t "${AGG_NET_NAME}:latest" -f ./src/tests/tools/mock_ietf_network_slice_sdn_ctrl/Dockerfile ./src/tests/tools/mock_ietf_network_slice_sdn_ctrl
     - docker rm -f ${TEST_NAME} || true
+    - docker rm -f ${AGG_NET_NAME} || true
+    - docker rm -f ${NCE_NAME} || true
     - docker run -d --name ${NCE_NAME} -p ${NCE_PORT}:8443 $CI_REGISTRY_IMAGE/${NCE_NAME}:latest
     - docker run -d --name ${AGG_NET_NAME} -p ${AGG_NET_PORT}:8443 $CI_REGISTRY_IMAGE/${AGG_NET_NAME}:latest
 
@@ -82,6 +84,10 @@ end2end_test ofc25_camara_e2e:
     # Destroy Scenario
     - kubectl delete namespaces tfs || true
 
+    - docker rm -f ${TEST_NAME} || true
+    - docker rm -f ${AGG_NET_NAME} || true
+    - docker rm -f ${NCE_NAME} || true
+
     # Clean old docker images
     - docker images --filter="dangling=true" --quiet | xargs -r docker rmi