diff --git a/dockers/cadvisor/docker-compose.yml b/dockers/cadvisor/docker-compose.yml
index b199ad8..ad7ae07 100644
--- a/dockers/cadvisor/docker-compose.yml
+++ b/dockers/cadvisor/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
 
   cadvisor:
-    image: gcr.io/cadvisor/cadvisor:v0.52.0
+    image: ghcr.io/google/cadvisor:v0.60.5
     container_name: cadvisor
     command:
       - "--store_container_labels=false"
@@ -16,14 +16,11 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.cadvisor-secure.entrypoints=websecure"
       - "traefik.http.routers.cadvisor-secure.rule=Host(`cadvisor-${site}.${domain}`)"
-      #- "traefik.http.routers.grafana-secure.tls=true"
       - "traefik.http.routers.cadvisor-secure.service=cadvisor"
       - "traefik.http.routers.cadvisor-secure.middlewares=test-adminipallowlist@file"
       - "traefik.http.services.cadvisor.loadbalancer.server.port=8080"
       - "traefik.docker.network=traefikNet"
 
-#    ports:
-#      - 8098:8080
     volumes:
       - /:/rootfs:ro
       - /var/run:/var/run:ro
diff --git a/dockers/grafana/docker-compose.yml b/dockers/grafana/docker-compose.yml
index cee62c8..de21d50 100644
--- a/dockers/grafana/docker-compose.yml
+++ b/dockers/grafana/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
 
   prometheus:
-    image: prom/prometheus:v3.3.0
+    image: prom/prometheus:v3.14.0
     restart: unless-stopped
     container_name: ${prometheusServName}
     volumes:
@@ -10,27 +10,15 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     command:
-#      - "--web.route-prefix=/"
-#      - "--web.external-url=https://prometheus.${domain}"
       - "--config.file=/etc/prometheus/prometheus.yml"
       - "--storage.tsdb.path=/prometheus"
       - "--web.console.libraries=/usr/share/prometheus/console_libraries"
       - "--web.console.templates=/usr/share/prometheus/consoles"
     networks:
       - traefikNet
-#    labels:
-#      - "traefik.enable=true"
-#      - "traefik.http.routers.prometheus-secure.entrypoints=websecure"
-#      - "traefik.http.middlewares.prometheus-stripprefix.stripprefix.prefixes=/prometheus"
-#      - "traefik.http.routers.prometheus-secure.rule=Host(`prometheus.${domain}`)"
-#      # - "traefik.http.routers.prometheus-secure.tls=true"
-#      - "traefik.http.routers.prometheus-secure.middlewares=prometheus-stripprefix,test-adminiallowlist@file,traefik-auth"
-#      - "traefik.http.routers.prometheus-secure.service=prometheus"
-#      - "traefik.http.services.prometheus.loadbalancer.server.port=9090"
-#      - "traefik.docker.network=traefikNet"
 
   grafana:
-    image: grafana/grafana:11.6.0
+    image: grafana/grafana:13.2.1
     restart: unless-stopped
     container_name: ${grafanaServName}
     volumes:
@@ -49,7 +37,6 @@ services:
       - "traefik.http.routers.grafana-secure.entrypoints=websecure"
       - "traefik.http.middlewares.grafana-stripprefix.stripprefix.prefixes=/grafana"
       - "traefik.http.routers.grafana-secure.rule=Host(`grafana.${domain}`)"
-      #- "traefik.http.routers.grafana-secure.tls=true"
       - "traefik.http.routers.grafana-secure.service=grafana"
       - "traefik.http.routers.grafana-secure.middlewares=grafana-stripprefix,test-adminipallowlist@file,traefik-auth"
       - "traefik.http.services.grafana.loadbalancer.server.port=3000"
diff --git a/dockers/portainer/docker-compose.yml b/dockers/portainer/docker-compose.yml
index 2c7ce91..d0f68da 100644
--- a/dockers/portainer/docker-compose.yml
+++ b/dockers/portainer/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   portainer:
-    image: portainer/portainer-ce:latest
+    image: portainer/portainer-ce:2.45.0
     container_name: portainer
     ports:
       - 9000:9000
diff --git a/dockers/portainer_agent/docker-compose.yml b/dockers/portainer_agent/docker-compose.yml
index d702b61..d47ab30 100644
--- a/dockers/portainer_agent/docker-compose.yml
+++ b/dockers/portainer_agent/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   edge_agent:
-    image: portainer/agent:latest
+    image: portainer/agent:2.45.0
     environment:
       - EDGE=1
       - CAP_HOST_MANAGEMENT=1