diff --git a/docker-compose.yml b/docker-compose.yml
index 9972029..43e316d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,33 +2,31 @@ version: '3'
 
 services:
   voltronic-mqtt:
-
-    # We're now (finally) supporting Multi-Arch builds (via Github actions) on Docker Hub!
-    image: bushrangers/ha-voltronic-mqtt
+    # Immagine custom da Gitea registry
+    image: gitea.home-nas-ds.org/alessio/docker-voltronic-homeassistant:latest
 
     # Uncomment if you want to build your own local version.
     #build:
     #  context: .
-    #  dockerfile: Dockerfile.dev
-
+    #  dockerfile: Dockerfile.multiarch
 
     container_name: voltronic-mqtt
 
     privileged: true
     restart: always
 
-    # Environment variables for auto-discovery
+    # Environment variables - configurano automaticamente mqtt.json e inverter.conf
     environment:
       # Device configuration
       - INVERTER_DEVICE=/dev/ttyUSB0
       
-      # MQTT Broker configuration
+      # MQTT Broker configuration (questi valori sovrascrivono mqtt.json all'avvio)
       - MQTT_SERVER=192.168.1.37
       - MQTT_PORT=1883
       - MQTT_TOPIC=homeassistant
       - MQTT_DEVICENAME=voltronic
       - MQTT_USERNAME=mqtt_user
-      - MQTT_PASSWORD=your_password_here
+      - MQTT_PASSWORD=3tUhCpuDs43e#@k
       
       # Auto-discovery options
       # Force auto-discovery on every container start (default: false)
@@ -40,33 +38,33 @@ services:
       - SKIP_DISCOVERY=false
 
     volumes:
-        - ./config/:/etc/inverter/
+      # Configurazione persistente (buffer sizes, calibration factors)
+      - ./config/:/etc/inverter/
+      
+      # Cache discovery per evitare re-discovery ad ogni restart
+      - voltronic-cache:/cache/
 
     devices:
-    #  - "/dev/mem:/dev/mem"
-
-    # USB Port Mapping
+      # USB Port Mapping
       - /dev/bus/usb:/dev/bus/usb:rwm
       - /dev/ttyUSB0:/dev/ttyUSB0:rwm
       - /dev/ttyUSB1:/dev/ttyUSB1:rwm
 
-    # Serial Port Mapping...
+      # Serial Port Mapping (optional, se usi RS232 nativo)
       - /dev/ttyS0:/dev/ttyS0
       - /dev/ttyS1:/dev/ttyS1
       - /dev/ttyS2:/dev/ttyS2
 
   # Used to auto-update images as we release new versions...
-  watchtower:
-    # Please see the following for configuration options:
-    #    https://containrrr.github.io/watchtower/container-selection/
-    image: containrrr/watchtower
-    container_name: watchtower
+  # watchtower:
+  #   image: containrrr/watchtower
+  #   container_name: watchtower
+  #   restart: always
+  #   privileged: true
+  #   volumes:
+  #     - /var/run/docker.sock:/var/run/docker.sock
+  #   command: --interval 500
 
-    restart: always
-    privileged: true
-
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-
-    command: --interval 500
+volumes:
+  voltronic-cache: