diff --git a/deployments/docker-compose/docker-compose.yaml b/deployments/docker-compose/docker-compose.yaml
index 6b419c9a..a4e0a0e6 100644
--- a/deployments/docker-compose/docker-compose.yaml
+++ b/deployments/docker-compose/docker-compose.yaml
@@ -129,7 +129,7 @@ services:
       - booking
 
     #######################################################
-      #  Kibana
+    #  Kibana
     #######################################################
   kibana:
     container_name: kibana
@@ -150,6 +150,7 @@ services:
   prometheus:
     image: prom/prometheus:latest
     container_name: prometheus
+    restart: unless-stopped
     ports:
       - "9090:9090"
     environment:
@@ -165,6 +166,7 @@ services:
   grafana:
     image: grafana/grafana
     container_name: grafana
+    restart: unless-stopped
     ports:
       - "3000:3000"
     volumes:
@@ -176,11 +178,34 @@ services:
     # node_exporter
     #######################################################
   node_exporter:
-    image: prom/node-exporter
+    image: quay.io/prometheus/node-exporter:latest
     container_name: node_exporter
     restart: unless-stopped
+    command:
+      - '--path.rootfs=/host'
+    pid: host
+    volumes:
+      - '/:/host:ro,rslave'
+    networks:
+      - booking   
+
+    #######################################################
+    # cadvisor
+    #######################################################
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor:latest
+    container_name: cadvisor
+    restart: unless-stopped
     ports:
-      - 9101:9100
+      - "8080:8080"
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:ro
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+      - /dev/disk/:/dev/disk:ro
+    devices:
+      - /dev/kmsg
     networks:
       - booking
       
diff --git a/deployments/docker-compose/infrastracture.yaml b/deployments/docker-compose/infrastracture.yaml
index e0fca935..61ce4b23 100644
--- a/deployments/docker-compose/infrastracture.yaml
+++ b/deployments/docker-compose/infrastracture.yaml
@@ -164,6 +164,7 @@ services:
   prometheus:
     image: prom/prometheus:latest
     container_name: prometheus
+    restart: unless-stopped
     ports:
       - "9090:9090"
     environment:
@@ -179,6 +180,7 @@ services:
   grafana:
     image: grafana/grafana
     container_name: grafana
+    restart: unless-stopped
     ports:
       - "3000:3000"
     volumes:
@@ -190,14 +192,38 @@ services:
     # node_exporter
     #######################################################
   node_exporter:
-    image: prom/node-exporter
+    image: quay.io/prometheus/node-exporter:latest
     container_name: node_exporter
     restart: unless-stopped
+    command:
+      - '--path.rootfs=/host'
+    pid: host
+    volumes:
+      - '/:/host:ro,rslave'
+    networks:
+      - booking   
+
+    #######################################################
+    # cadvisor
+    #######################################################
+  cadvisor:
+    image: gcr.io/cadvisor/cadvisor:latest
+    container_name: cadvisor
+    restart: unless-stopped
     ports:
-      - 9101:9100
+      - "8080:8080"
+    volumes:
+      - /:/rootfs:ro
+      - /var/run:/var/run:ro
+      - /sys:/sys:ro
+      - /var/lib/docker/:/var/lib/docker:ro
+      - /dev/disk/:/dev/disk:ro
+    devices:
+      - /dev/kmsg
     networks:
       - booking
-
+      
+    
 networks:
   booking:
 
diff --git a/deployments/docker-compose/monitoring/grafana-data/data/grafana.db b/deployments/docker-compose/monitoring/grafana-data/data/grafana.db
index f8713c0e..ff30cefc 100644
Binary files a/deployments/docker-compose/monitoring/grafana-data/data/grafana.db and b/deployments/docker-compose/monitoring/grafana-data/data/grafana.db differ
diff --git a/deployments/docker-compose/monitoring/prom/prometheus.yml b/deployments/docker-compose/monitoring/prom/prometheus.yml
index 21536611..6aaff5bf 100644
--- a/deployments/docker-compose/monitoring/prom/prometheus.yml
+++ b/deployments/docker-compose/monitoring/prom/prometheus.yml
@@ -19,6 +19,14 @@ scrape_configs:
   static_configs:
   - targets:
     - localhost:9090
+- job_name: cadvisor
+  static_configs:
+  - targets:
+    - cadvisor:8080
+- job_name: node_exporter
+  static_configs:
+  - targets:
+    - node_exporter:9100    
 - job_name: flight  
   scrape_interval: 15s  
   scrape_timeout: 10s