diff --git a/manifests/kpi_value_apiservice.yaml b/manifests/kpi_value_apiservice.yaml
index eb53a23839b7c452f848c1819f4ba3cf620eed2e..1a5dfc2655a4e16ce9f426d3204242acfa5d0f04 100644
--- a/manifests/kpi_value_apiservice.yaml
+++ b/manifests/kpi_value_apiservice.yaml
@@ -31,7 +31,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
         - name: server
-          image: labs.etsi.org:5050/tfs/controller/kpi_manager:latest
+          image: labs.etsi.org:5050/tfs/controller/kpi_value_api:latest
           imagePullPolicy: Always
           ports:
             - containerPort: 30020
diff --git a/manifests/kpi_value_writerservice.yaml b/manifests/kpi_value_writerservice.yaml
index 19cab536f04dbfade01464350b0f8dd1961e9516..9bd5da943b1246ad6cd8e272f37fb8c9d86df5b0 100644
--- a/manifests/kpi_value_writerservice.yaml
+++ b/manifests/kpi_value_writerservice.yaml
@@ -31,7 +31,7 @@ spec:
       terminationGracePeriodSeconds: 5
       containers:
         - name: server
-          image: labs.etsi.org:5050/tfs/controller/kpi_manager:latest
+          image: labs.etsi.org:5050/tfs/controller/kpi_value_writer:latest
           imagePullPolicy: Always
           ports:
             - containerPort: 30030
diff --git a/src/kpi_manager/service/__main__.py b/src/kpi_manager/service/__main__.py
index a4884c545debaa632a9ff0cdbc458949ab8f3458..244d5afa373a6462a0382a0ed26a588088a689a1 100644
--- a/src/kpi_manager/service/__main__.py
+++ b/src/kpi_manager/service/__main__.py
@@ -12,14 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging, signal, sys, threading, time
-from prometheus_client import start_http_server
-from common.Constants import ServiceNameEnum
-from common.Settings import (
-    ENVVAR_SUFIX_SERVICE_HOST, ENVVAR_SUFIX_SERVICE_PORT_GRPC, get_env_var_name, get_log_level, get_metrics_port,
-    wait_for_environment_variables)
-from common.proto import monitoring_pb2
-from .NameMapping import NameMapping          # import updated
+import logging, signal, sys, threading
+from common.Settings import get_log_level
 from .KpiManagerService import KpiManagerService
 
 terminate = threading.Event()