diff --git a/src/tests/ecoc24/delete.sh b/src/tests/ecoc24/delete.sh
index 3acd872a3552a9d33ff8a4e0767e6a9ae6337f8f..6ad12d15c9ea262ba0b72b6d27abb1b8c457f0cb 100755
--- a/src/tests/ecoc24/delete.sh
+++ b/src/tests/ecoc24/delete.sh
@@ -18,5 +18,5 @@
 kubectl delete namespace tfs-e2e tfs-ip
 
 # Delete secondary ingress controllers
-kubectl delete -f ecoc24/nginx-ingress-controller-e2e.yaml
-kubectl delete -f ecoc24/nginx-ingress-controller-ip.yaml
+kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
+kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml
diff --git a/src/tests/ecoc24/deploy_e2e.sh b/src/tests/ecoc24/deploy_e2e.sh
index 7f1bfe94518385460a76a7dc08ed9956571a58db..8e1041cf9c0b30132d1574461cc7203fde110397 100755
--- a/src/tests/ecoc24/deploy_e2e.sh
+++ b/src/tests/ecoc24/deploy_e2e.sh
@@ -18,12 +18,12 @@
 kubectl delete namespace tfs-e2e
 
 # Delete secondary ingress controllers
-kubectl delete -f ecoc24/nginx-ingress-controller-e2e.yaml
+kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
 
 # Create secondary ingress controllers
-kubectl apply -f ecoc24/nginx-ingress-controller-e2e.yaml
+kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
 
 # Deploy TFS for E2E
-source ecoc24/deploy_specs_e2e.sh
+source src/tests/ecoc24/deploy_specs_e2e.sh
 ./deploy/all.sh
 mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_e2e.sh
diff --git a/src/tests/ecoc24/deploy_ip.sh b/src/tests/ecoc24/deploy_ip.sh
index 5d14f2b072062d90fa50676f1d03a24e95bfef62..f51e9762bc75ef0d8e32ebdd9dddbecb2ebefae2 100755
--- a/src/tests/ecoc24/deploy_ip.sh
+++ b/src/tests/ecoc24/deploy_ip.sh
@@ -18,12 +18,12 @@
 kubectl delete namespace tfs-ip
 
 # Delete secondary ingress controllers
-kubectl delete -f ecoc24/nginx-ingress-controller-ip.yaml
+kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml
 
 # Create secondary ingress controllers
-kubectl apply -f ecoc24/nginx-ingress-controller-ip.yaml
+kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml
 
-# Deploy TFS for ip
-source ecoc24/deploy_specs_ip.sh
+# Deploy TFS for IP
+source src/tests/ecoc24/deploy_specs_ip.sh
 ./deploy/all.sh
 mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_ip.sh
diff --git a/src/tests/ecoc24/deploy_specs_e2e.sh b/src/tests/ecoc24/deploy_specs_e2e.sh
index 1d9a6228be663748fb3fe4971860d749a90a11ea..f919336941a71267f7381e7997db8530505b4697 100755
--- a/src/tests/ecoc24/deploy_specs_e2e.sh
+++ b/src/tests/ecoc24/deploy_specs_e2e.sh
@@ -48,7 +48,7 @@ export TFS_IMAGE_TAG="dev"
 export TFS_K8S_NAMESPACE="tfs-e2e"
 
 # Set additional manifest files to be applied after the deployment
-export TFS_EXTRA_MANIFESTS="src/testsecoc24/tfs-ingress-e2e.yaml"
+export TFS_EXTRA_MANIFESTS="src/tests/ecoc24/tfs-ingress-e2e.yaml"
 
 # Uncomment to monitor performance of components
 export TFS_EXTRA_MANIFESTS="${TFS_EXTRA_MANIFESTS} manifests/servicemonitors.yaml"
diff --git a/src/tests/ecoc24/deploy_specs_ip.sh b/src/tests/ecoc24/deploy_specs_ip.sh
index 256e6e8e2ba9f9fc78e032362bd45c00a6d07788..12c718330b851b42706b19fb679a64c9f2cf4a4b 100755
--- a/src/tests/ecoc24/deploy_specs_ip.sh
+++ b/src/tests/ecoc24/deploy_specs_ip.sh
@@ -21,7 +21,7 @@ export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"
 
 # Set the list of components, separated by spaces, you want to build images for, and deploy.
 # export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator"
-export TFS_COMPONENTS="context device pathcomp service nbi webui "
+export TFS_COMPONENTS="context device pathcomp service nbi webui"
 
 
 # Uncomment to activate Monitoring
diff --git a/src/tests/ecoc24/fast_redeploy.sh b/src/tests/ecoc24/fast_redeploy.sh
index cef672fedb0beee4d375b2e9c8332861c8557c9f..0a6d9bf32b2b21d373538c21161ef6fa7abe5f64 100755
--- a/src/tests/ecoc24/fast_redeploy.sh
+++ b/src/tests/ecoc24/fast_redeploy.sh
@@ -17,31 +17,31 @@
 kubectl delete namespace tfs-e2e tfs-ip
 
 echo "Deploying tfs-e2e ..."
-kubectl delete -f ecoc24/nginx-ingress-controller-e2e.yaml                 > ./tmp/logs/deploy-tfs-e2e.log
-kubectl create namespace tfs-e2e                                          > ./tmp/logs/deploy-tfs-e2e.log
-kubectl apply -f ecoc24/nginx-ingress-controller-e2e.yaml                  > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/contextservice.yaml  > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/deviceservice.yaml   > ./tmp/logs/deploy-tfs-e2e.log
+kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml                > ./tmp/logs/deploy-tfs-e2e.log
+kubectl create namespace tfs-e2e                                                    > ./tmp/logs/deploy-tfs-e2e.log
+kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml                 > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/manifests/contextservice.yaml            > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/manifests/deviceservice.yaml             > ./tmp/logs/deploy-tfs-e2e.log
 kubectl --namespace tfs-e2e apply -f ./tmp/manifests/e2eorchestratorservice.yaml    > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/pathcompservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/serviceservice.yaml  > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/sliceservice.yaml    > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/webuiservice.yaml    > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ecoc24/tfs-ingress-e2e.yaml        > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/manifests/pathcompservice.yaml           > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/manifests/serviceservice.yaml            > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/manifests/sliceservice.yaml              > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/manifests/webuiservice.yaml              > ./tmp/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ecoc24/tfs-ingress-e2e.yaml                    > ./tmp/logs/deploy-tfs-e2e.log
 printf "\n"
 
 echo "Deploying tfs-ip ..."
-kubectl delete -f ecoc24/nginx-ingress-controller-ip.yaml                  > ./tmp/logs/deploy-tfs-ip.log
-kubectl create namespace tfs-ip                                           > ./tmp/logs/deploy-tfs-ip.log
-kubectl apply -f ecoc24/nginx-ingress-controller-ip.yaml                   > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/contextservice.yaml   > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/deviceservice.yaml    > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/pathcompservice.yaml  > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/serviceservice.yaml   > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/sliceservice.yaml     > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/vntmanagerservice.yaml     > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/webuiservice.yaml     > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ecoc24/tfs-ingress-ip.yaml          > ./tmp/logs/deploy-tfs-ip.log
+kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml                 > ./tmp/logs/deploy-tfs-ip.log
+kubectl create namespace tfs-ip                                                     > ./tmp/logs/deploy-tfs-ip.log
+kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml                  > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/contextservice.yaml             > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/deviceservice.yaml              > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/pathcompservice.yaml            > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/serviceservice.yaml             > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/sliceservice.yaml               > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/vntmanagerservice.yaml          > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/manifests/webuiservice.yaml               > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ecoc24/tfs-ingress-ip.yaml                      > ./tmp/logs/deploy-tfs-ip.log
 printf "\n"
 
 echo "Waiting tfs-e2e ..."