diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2fe4057332cb87e4014d2a9dd2fef04c9c118c9b..25dcab336c39691e17c6150073c50566c4127559 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,39 +21,39 @@ stages:
 
 # include the individual .gitlab-ci.yml of each micro-service and tests
 include:
-  #- local: '/manifests/.gitlab-ci.yml'
-  - local: '/src/monitoring/.gitlab-ci.yml'
-  - local: '/src/nbi/.gitlab-ci.yml'
-  - local: '/src/context/.gitlab-ci.yml'
-  - local: '/src/device/.gitlab-ci.yml'
-  - local: '/src/service/.gitlab-ci.yml'
-  - local: '/src/dbscanserving/.gitlab-ci.yml'
-  - local: '/src/opticalattackmitigator/.gitlab-ci.yml'
-  - local: '/src/opticalattackdetector/.gitlab-ci.yml'
-  - local: '/src/opticalattackmanager/.gitlab-ci.yml'
-  - local: '/src/opticalcontroller/.gitlab-ci.yml'
-  - local: '/src/ztp/.gitlab-ci.yml'
-  - local: '/src/policy/.gitlab-ci.yml'
-  - local: '/src/automation/.gitlab-ci.yml'
-  - local: '/src/forecaster/.gitlab-ci.yml'
-  #- local: '/src/webui/.gitlab-ci.yml'
-  #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'
-  #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'
-  #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'
-  - local: '/src/slice/.gitlab-ci.yml'
-  #- local: '/src/interdomain/.gitlab-ci.yml'
-  - local: '/src/pathcomp/.gitlab-ci.yml'
-  #- local: '/src/dlt/.gitlab-ci.yml'
-  - local: '/src/load_generator/.gitlab-ci.yml'
-  - local: '/src/bgpls_speaker/.gitlab-ci.yml'
-  - local: '/src/kpi_manager/.gitlab-ci.yml'
-  - local: '/src/kpi_value_api/.gitlab-ci.yml'
-  - local: '/src/kpi_value_writer/.gitlab-ci.yml'
-  - local: '/src/telemetry/.gitlab-ci.yml'
-  - local: '/src/analytics/.gitlab-ci.yml'
-  - local: '/src/qos_profile/.gitlab-ci.yml'
-  - local: '/src/vnt_manager/.gitlab-ci.yml'
-  - local: '/src/e2e_orchestrator/.gitlab-ci.yml'
+#  #- local: '/manifests/.gitlab-ci.yml'
+#  - local: '/src/monitoring/.gitlab-ci.yml'
+#  - local: '/src/nbi/.gitlab-ci.yml'
+#  - local: '/src/context/.gitlab-ci.yml'
+#  - local: '/src/device/.gitlab-ci.yml'
+#  - local: '/src/service/.gitlab-ci.yml'
+#  - local: '/src/dbscanserving/.gitlab-ci.yml'
+#  - local: '/src/opticalattackmitigator/.gitlab-ci.yml'
+#  - local: '/src/opticalattackdetector/.gitlab-ci.yml'
+#  - local: '/src/opticalattackmanager/.gitlab-ci.yml'
+#  - local: '/src/opticalcontroller/.gitlab-ci.yml'
+#  - local: '/src/ztp/.gitlab-ci.yml'
+#  - local: '/src/policy/.gitlab-ci.yml'
+#  - local: '/src/automation/.gitlab-ci.yml'
+#  - local: '/src/forecaster/.gitlab-ci.yml'
+#  #- local: '/src/webui/.gitlab-ci.yml'
+#  #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'
+#  #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'
+#  #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'
+#  - local: '/src/slice/.gitlab-ci.yml'
+#  #- local: '/src/interdomain/.gitlab-ci.yml'
+#  - local: '/src/pathcomp/.gitlab-ci.yml'
+#  #- local: '/src/dlt/.gitlab-ci.yml'
+#  - local: '/src/load_generator/.gitlab-ci.yml'
+#  - local: '/src/bgpls_speaker/.gitlab-ci.yml'
+#  - local: '/src/kpi_manager/.gitlab-ci.yml'
+#  - local: '/src/kpi_value_api/.gitlab-ci.yml'
+#  - local: '/src/kpi_value_writer/.gitlab-ci.yml'
+#  - local: '/src/telemetry/.gitlab-ci.yml'
+#  - local: '/src/analytics/.gitlab-ci.yml'
+#  - local: '/src/qos_profile/.gitlab-ci.yml'
+#  - local: '/src/vnt_manager/.gitlab-ci.yml'
+#  - local: '/src/e2e_orchestrator/.gitlab-ci.yml'
 
   # This should be last one: end-to-end integration tests
   - local: '/src/tests/.gitlab-ci.yml'
diff --git a/manifests/deviceservice.yaml b/manifests/deviceservice.yaml
index 950b984420a4cb4d50a455312ecb306752a406fe..ef5195eaeb0d16d2ee5c3e5b7ba2417db461b479 100644
--- a/manifests/deviceservice.yaml
+++ b/manifests/deviceservice.yaml
@@ -39,7 +39,7 @@ spec:
             - containerPort: 9192
           env:
             - name: LOG_LEVEL
-              value: "INFO"
+              value: "DEBUG"
           startupProbe:
             exec:
               command: ["/bin/grpc_health_probe", "-addr=:2020"]
diff --git a/manifests/pathcompservice.yaml b/manifests/pathcompservice.yaml
index 0cac6cc18604f346214ebe44e7eb7d2d64763cbd..b6f969bf489bcf8c9f4f67b0a9427172db81596e 100644
--- a/manifests/pathcompservice.yaml
+++ b/manifests/pathcompservice.yaml
@@ -36,7 +36,7 @@ spec:
             - containerPort: 9192
           env:
             - name: LOG_LEVEL
-              value: "INFO"
+              value: "DEBUG"
             - name: ENABLE_FORECASTER
               value: "NO"
           readinessProbe:
diff --git a/manifests/servicemonitors.yaml b/manifests/servicemonitors.yaml
index d486ca971e63cf9ccc20a435d49c39e530fb438f..fa6aed0f927efa21d55ff65b18b401070e411bf4 100644
--- a/manifests/servicemonitors.yaml
+++ b/manifests/servicemonitors.yaml
@@ -575,9 +575,9 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   namespace: monitoring # namespace where prometheus is running
-  name: tfs-kpi_value_apiservice-metric
+  name: tfs-kpi-value-apiservice-metric
   labels:
-    app: kpi_value_apiservice
+    app: kpi-value-apiservice
     #release: prometheus
     #release: prom  # name of the release
     # ( VERY IMPORTANT: You need to know the correct release name by viewing
@@ -588,7 +588,7 @@ spec:
     matchLabels:
       # Target app service
       #namespace: tfs
-      app: kpi_value_apiservice # same as above
+      app: kpi-value-apiservice # same as above
       #release: prometheus # same as above
   endpoints:
     - port: metrics # named port in target app
@@ -604,9 +604,9 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   namespace: monitoring # namespace where prometheus is running
-  name: tfs-kpi_value_writerservice-metric
+  name: tfs-kpi-value-writerservice-metric
   labels:
-    app: kpi_value_writerservice
+    app: kpi-value-writerservice
     #release: prometheus
     #release: prom  # name of the release
     # ( VERY IMPORTANT: You need to know the correct release name by viewing
@@ -617,7 +617,7 @@ spec:
     matchLabels:
       # Target app service
       #namespace: tfs
-      app: kpi_value_writerservice # same as above
+      app: kpi-value-writerservice # same as above
       #release: prometheus # same as above
   endpoints:
     - port: metrics # named port in target app