diff --git a/src/telemetry/backend/service/TelemetryBackendService.py b/src/telemetry/backend/service/TelemetryBackendService.py
index 6b9a6a8da537aa8cfff00896c75f65de46954787..991298d370abf082d08880fea1c870c5192f37c9 100755
--- a/src/telemetry/backend/service/TelemetryBackendService.py
+++ b/src/telemetry/backend/service/TelemetryBackendService.py
@@ -24,6 +24,8 @@ from confluent_kafka import Consumer as KafkaConsumer
 from confluent_kafka import KafkaError
 from common.tools.kafka.Variables import KafkaConfig, KafkaTopic
 from common.method_wrappers.Decorator import MetricsPool
+from common.tools.service.GenericGrpcService import GenericGrpcService
+
 
 
 LOGGER             = logging.getLogger(__name__)
@@ -31,12 +33,11 @@ METRICS_POOL       = MetricsPool('TelemetryBackend', 'backendService')
 # EXPORTER_ENDPOINT  = "http://10.152.183.2:9100/metrics"
 
 
-class TelemetryBackendService:
+class TelemetryBackendService(GenericGrpcService):
     """
     Class listens for request on Kafka topic, fetches requested metrics from device.
     Produces metrics on both RESPONSE and VALUE kafka topics.
     """
-
     def __init__(self):
         LOGGER.info('Init TelemetryBackendService')
         self.kafka_producer = KafkaProducer({'bootstrap.servers' : KafkaConfig.get_kafka_address()})
diff --git a/src/telemetry/frontend/Dockerfile b/src/telemetry/frontend/Dockerfile
index 0c3e1a66acc39af3ebc4cfbaf68a98eed28042a0..7125d31fe74f7c44a52c2783369c2dc7a4a31160 100644
--- a/src/telemetry/frontend/Dockerfile
+++ b/src/telemetry/frontend/Dockerfile
@@ -64,6 +64,7 @@ RUN python3 -m pip install -r requirements.txt
 WORKDIR /var/teraflow
 COPY src/telemetry/__init__.py telemetry/__init__.py
 COPY src/telemetry/frontend/. telemetry/frontend/
+COPY src/telemetry/database/. telemetry/database/
 
 # Start the service
 ENTRYPOINT ["python", "-m", "telemetry.frontend.service"]