diff --git a/MP.RIOC/Services/MetricsCalcService.cs b/MP.RIOC/Services/MetricsCalcService.cs
index 03492a3d..15d8752c 100644
--- a/MP.RIOC/Services/MetricsCalcService.cs
+++ b/MP.RIOC/Services/MetricsCalcService.cs
@@ -166,6 +166,9 @@ namespace MP.RIOC.Services
                         var daysIndex = DaysIndexKey(dest, machineId);
                         var dayScore = ToEpochSeconds(dayStart);
 
+                        // 5. Imposta TTL 30 giorni anche sulle chiavi index per pulizia automatica
+                        tasks.Add(batch.KeyExpireAsync(hoursIndex, TimeSpan.FromDays(30)));
+
                         if (!dailyAggregates.TryGetValue(dayKey, out var agg))
                         {
                             agg = new AggregatedStats();
@@ -206,6 +209,9 @@ namespace MP.RIOC.Services
                                         agg.NoReply.ToString(CultureInfo.InvariantCulture),
                                         SentinelValue
                                     }));
+
+                        // Imposta TTL 30 giorni su bucket daily aggregato
+                        tasks.Add(batch.KeyExpireAsync(key, TimeSpan.FromDays(30)));
                     }
 
                     // Esegui tutto il batch in un unico round-trip