diff --git a/src/tests/ecoc24/tfs-ingress-e2e.yaml b/src/tests/ecoc24/tfs-ingress-e2e.yaml
index c7d5551f048332801a36921f79ae9814026bac1b..1b82ae44ca0945163701bc18a250a1742e921519 100644
--- a/src/tests/ecoc24/tfs-ingress-e2e.yaml
+++ b/src/tests/ecoc24/tfs-ingress-e2e.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,40 +21,47 @@ metadata:
 spec:
   ingressClassName: tfs-ingress-class-e2e
   rules:
-  - http:
-      paths:
-        - path: /webui(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 8004
-        - path: /grafana(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 3000
-        - path: /context(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: contextservice
-              port:
-                number: 8080
-        - path: /()(restconf/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
-        - path: /()(tfs-api/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
+    - http:
+        paths:
+          - path: /webui(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 8004
+          - path: /grafana(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 3000
+          - path: /()(restconf/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(tfs-api/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(bmw/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(qkd_app/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
diff --git a/src/tests/ecoc24/tfs-ingress-ip.yaml b/src/tests/ecoc24/tfs-ingress-ip.yaml
index f4e796349dce88749d8acc4bbd297d5494dc5642..6ee6ada32f3f278c5f36dfbb08d936a432bfef23 100644
--- a/src/tests/ecoc24/tfs-ingress-ip.yaml
+++ b/src/tests/ecoc24/tfs-ingress-ip.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,40 +21,47 @@ metadata:
 spec:
   ingressClassName: tfs-ingress-class-ip
   rules:
-  - http:
-      paths:
-        - path: /webui(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 8004
-        - path: /grafana(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 3000
-        - path: /context(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: contextservice
-              port:
-                number: 8080
-        - path: /()(restconf/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
-        - path: /()(tfs-api/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
+    - http:
+        paths:
+          - path: /webui(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 8004
+          - path: /grafana(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 3000
+          - path: /()(restconf/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(tfs-api/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(bmw/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(qkd_app/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
diff --git a/src/tests/ecoc24/tfs-ingress-opt.yaml b/src/tests/ecoc24/tfs-ingress-opt.yaml
index e0dc3b1ad8a58d83f09972d716c5b35439d46f27..50ddd4f046acf74cfe57e73f55e29e1b77fd32af 100644
--- a/src/tests/ecoc24/tfs-ingress-opt.yaml
+++ b/src/tests/ecoc24/tfs-ingress-opt.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,40 +21,47 @@ metadata:
 spec:
   ingressClassName: tfs-ingress-class-opt
   rules:
-  - http:
-      paths:
-        - path: /webui(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 8004
-        - path: /grafana(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 3000
-        - path: /context(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: contextservice
-              port:
-                number: 8080
-        - path: /()(restconf/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
-        - path: /()(tfs-api/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
+    - http:
+        paths:
+          - path: /webui(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 8004
+          - path: /grafana(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 3000
+          - path: /()(restconf/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(tfs-api/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(bmw/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(qkd_app/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080