diff --git a/src/tests/ecoc22/.gitlab-ci.yml b/src/tests/ecoc22/.gitlab-ci.yml
index 467f2f8fd4766e2fe6e9e382a0b422075f8cc15d..7e238dda287361fc5da0d4c50ae9b66f49ae6a9a 100644
--- a/src/tests/ecoc22/.gitlab-ci.yml
+++ b/src/tests/ecoc22/.gitlab-ci.yml
@@ -70,6 +70,7 @@ end2end_test ecoc22:
     # Deploy TeraFlowSDN
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
+    - ./deploy/kafka.sh
     - ./deploy/qdb.sh
     - ./deploy/expose_dashboard.sh
     - ./deploy/tfs.sh
diff --git a/src/tests/eucnc24/.gitlab-ci.yml b/src/tests/eucnc24/.gitlab-ci.yml
index 1ae05f27469220711344728429c135858e3a345e..146310b6282f57d0203283c53b1456b27a89652c 100644
--- a/src/tests/eucnc24/.gitlab-ci.yml
+++ b/src/tests/eucnc24/.gitlab-ci.yml
@@ -93,8 +93,8 @@ end2end_test eucnc24:
     # Deploy TeraFlowSDN
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
-    - ./deploy/qdb.sh
     - ./deploy/kafka.sh
+    - ./deploy/qdb.sh
     - ./deploy/tfs.sh
     - ./deploy/show.sh
 
diff --git a/src/tests/ofc22/.gitlab-ci.yml b/src/tests/ofc22/.gitlab-ci.yml
index 0fbe2375a0ea0689946ed955861167efc17da31b..6ba746bb0016c78ed990ec5eefeade6055ffff7b 100644
--- a/src/tests/ofc22/.gitlab-ci.yml
+++ b/src/tests/ofc22/.gitlab-ci.yml
@@ -71,6 +71,7 @@ end2end_test ofc22:
     # Deploy TeraFlowSDN
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
+    - ./deploy/kafka.sh
     - ./deploy/qdb.sh
     - ./deploy/expose_dashboard.sh
     - ./deploy/tfs.sh
diff --git a/src/tests/ofc24/.gitlab-ci.yml b/src/tests/ofc24/.gitlab-ci.yml
index 7937fd1be870d11c78f2042ab98c727f7ad1eb0b..412f4ed5e21cb6e01250723a1edf8c345d5be3ff 100644
--- a/src/tests/ofc24/.gitlab-ci.yml
+++ b/src/tests/ofc24/.gitlab-ci.yml
@@ -112,6 +112,7 @@ end2end_test ofc24:
     # Deploy TeraFlowSDN
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
+    - ./deploy/kafka.sh
     - ./deploy/qdb.sh
     - ./deploy/expose_dashboard.sh
     - ./deploy/tfs.sh
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 f69c37b38a5a4414c2d75f816ed12035cbb0d53c..2fc933827f0a7b8b9815ecc9c717140a68fd8e43 100644
--- a/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
+++ b/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
@@ -41,8 +41,8 @@ end2end_test ofc25_camara_agg_net:
     # Deploy TeraFlowSDN
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
-    - ./deploy/qdb.sh
     - ./deploy/kafka.sh
+    - ./deploy/qdb.sh
     - ./deploy/tfs.sh
     - ./deploy/show.sh
 
diff --git a/src/tests/ofc25-camara-agg-net-controller/Dockerfile b/src/tests/ofc25-camara-agg-net-controller/Dockerfile
index 92b0bfeb428df9570bd022c1df5d79e9039bf6dd..d6aedac80a3b9da9a8c39278ec35bcec3dc5c198 100644
--- a/src/tests/ofc25-camara-agg-net-controller/Dockerfile
+++ b/src/tests/ofc25-camara-agg-net-controller/Dockerfile
@@ -71,6 +71,8 @@ COPY src/service/__init__.py service/__init__.py
 COPY src/service/client/. service/client/
 COPY src/slice/__init__.py slice/__init__.py
 COPY src/slice/client/. slice/client/
+COPY src/vnt_manager/__init__.py vnt_manager/__init__.py
+COPY src/vnt_manager/client/. vnt_manager/client/
 COPY src/tests/*.py ./tests/
 COPY src/tests/ofc25-camara-agg-net-controller/__init__.py ./tests/ofc25-camara-agg-net-controller/__init__.py
 COPY src/tests/ofc25-camara-agg-net-controller/data/. ./tests/ofc25-camara-agg-net-controller/data/
diff --git a/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml b/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml
index c78468180ee8fdf855c0dd096031d49bd53ceec3..22f6e38e03b5cf3c13506b0faf36733978ed95f1 100644
--- a/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml
+++ b/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml
@@ -48,8 +48,8 @@ end2end_test ofc25_camara_e2e:
     # Deploy TeraFlowSDN
     - ./deploy/crdb.sh
     - ./deploy/nats.sh
-    - ./deploy/qdb.sh
     - ./deploy/kafka.sh
+    - ./deploy/qdb.sh
     - ./deploy/tfs.sh
     - ./deploy/show.sh
 
diff --git a/src/tests/ofc25-camara-e2e-controller/Dockerfile b/src/tests/ofc25-camara-e2e-controller/Dockerfile
index 040f976921c487666f3e7bfa5d2488a9b579b7b3..35ca5d4dbfb751ffe31d940c31716a6917676b02 100644
--- a/src/tests/ofc25-camara-e2e-controller/Dockerfile
+++ b/src/tests/ofc25-camara-e2e-controller/Dockerfile
@@ -71,6 +71,8 @@ COPY src/service/__init__.py service/__init__.py
 COPY src/service/client/. service/client/
 COPY src/slice/__init__.py slice/__init__.py
 COPY src/slice/client/. slice/client/
+COPY src/vnt_manager/__init__.py vnt_manager/__init__.py
+COPY src/vnt_manager/client/. vnt_manager/client/
 COPY src/tests/*.py ./tests/
 COPY src/tests/ofc25-camara-e2e-controller/__init__.py ./tests/ofc25-camara-e2e-controller/__init__.py
 COPY src/tests/ofc25-camara-e2e-controller/data/. ./tests/ofc25-camara-e2e-controller/data/