diff --git a/installers/docker/osm_pods/lcm.yaml b/installers/docker/osm_pods/lcm.yaml
index 2493de6..517c069 100644
--- a/installers/docker/osm_pods/lcm.yaml
+++ b/installers/docker/osm_pods/lcm.yaml
@@ -1,4 +1,5 @@
 # Copyright 2019 TATA ELXSI
+# Copyright 2020 Whitestack
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +13,7 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License
-# Author: Vijay Nag B S (vijaynag.bs@tataelxsi.co.in)
+# Author: Vijay Nag B S (vijaynag.bs@tataelxsi.co.in), Fabián Bravo(fbravo@whitestack.com)
 
 apiVersion: apps/v1
 kind: Deployment
@@ -58,12 +59,7 @@
         volumeMounts:
         - name: osm-packages
           mountPath: /app/storage
-        - name: prometheus-config
-          mountPath: /etc/prometheus
       volumes:
       - name: osm-packages
         hostPath:
          path: /var/lib/osm/osm_osm_packages/_data
-      - name: prometheus-config
-        hostPath:
-          path: /var/lib/osm/prometheus
diff --git a/installers/docker/osm_pods/mongo.yaml b/installers/docker/osm_pods/mongo.yaml
index 5b2571d..7eb1dc8 100644
--- a/installers/docker/osm_pods/mongo.yaml
+++ b/installers/docker/osm_pods/mongo.yaml
@@ -1,4 +1,5 @@
 # Copyright 2019 TATA ELXSI
+# Copyright 2021 Whitestack
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +13,7 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License
-# Author: Vijay Nag B S (vijaynag.bs@tataelxsi.co.in)
+# Author: Vijay Nag B S (vijaynag.bs@tataelxsi.co.in), Fabián Bravo(fbravo@whitestack.com)
 
 apiVersion: v1
 kind: Service
@@ -48,12 +49,21 @@
       containers:
       - name: mongo
         image: mongo:latest
+        command:
+          - mongod
+          - "--replSet"
+          - rs0
         ports:
         - containerPort: 27017
           protocol: TCP
         volumeMounts:
         - name: mongo-db
           mountPath: /data/db
+      - name: mongo-sidecar
+        image: cvallance/mongo-k8s-sidecar
+        env:
+          - name: MONGO_SIDECAR_POD_LABELS
+            value: "app=mongo"
       volumes:
       - name: mongo-db
         hostPath:
diff --git a/installers/docker/osm_pods/prometheus.yaml b/installers/docker/osm_pods/prometheus.yaml
index 93cd20a..431b9b3 100644
--- a/installers/docker/osm_pods/prometheus.yaml
+++ b/installers/docker/osm_pods/prometheus.yaml
@@ -1,3 +1,25 @@
+# Copyright 2021 Whitestack, LLC
+# *************************************************************
+
+# This file is part of OSM Monitoring module
+# All Rights Reserved to Whitestack, LLC
+
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+
+#         http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# For those usages not covered by the Apache License, Version 2.0 please
+# contact: fbravo@whitestack.com or glavado@whitestack.com
+##
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -105,12 +127,25 @@
           mountPath: /etc/prometheus
         - name: prom-db
           mountPath: /prometheus
+      - name: prometheus-config-sidecar
+        image: opensourcemano/prometheus:11
+        env:
+        - name: MONGODB_URL
+          value: mongodb://mongodb-k8s:27017/?replicaSet=rs0
+        - name: PROMETHEUS_CONFIG_FILE
+          value: /etc/prometheus/prometheus.yml
+        - name: TARGET_DATABASE
+          value: osm
+        - name: PROMETHEUS_URL
+          value: http://prometheus:9090
+        volumeMounts:
+        - name: prom-config
+          mountPath: /etc/prometheus
       volumes:
       - emptyDir: {}
         name: prom-db
       - name: prom-config
-        hostPath:
-          path: /var/lib/osm/prometheus
+        emptyDir: {}
       - name: init-prom-config
         configMap:
           name: prom