diff --git a/src/main/java/org/opensearch/timeseries/indices/IndexManagement.java b/src/main/java/org/opensearch/timeseries/indices/IndexManagement.java
index 5ef8f68c3..2ca6dd64c 100644
--- a/src/main/java/org/opensearch/timeseries/indices/IndexManagement.java
+++ b/src/main/java/org/opensearch/timeseries/indices/IndexManagement.java
@@ -74,6 +74,7 @@
 import org.opensearch.core.xcontent.NamedXContentRegistry;
 import org.opensearch.core.xcontent.XContentParser;
 import org.opensearch.core.xcontent.XContentParser.Token;
+import org.opensearch.forecast.constant.ForecastCommonName;
 import org.opensearch.forecast.indices.ForecastIndex;
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.query.BoolQueryBuilder;
@@ -289,7 +290,7 @@ protected void choosePrimaryShards(CreateIndexRequest request, boolean hiddenInd
             );
     }
 
-    protected void deleteOldHistoryIndices(String indexPattern, TimeValue historyRetentionPeriod, Integer customResultIndexTtl) {
+    protected void deleteOldHistoryIndices(String indexPattern, TimeValue historyRetentionPeriod) {
         Set<String> candidates = new HashSet<String>();
 
         ClusterStateRequest clusterStateRequest = new ClusterStateRequest()
@@ -302,12 +303,12 @@ protected void deleteOldHistoryIndices(String indexPattern, TimeValue historyRet
         adminClient.cluster().state(clusterStateRequest, ActionListener.wrap(clusterStateResponse -> {
             String latestToDelete = null;
             long latest = Long.MIN_VALUE;
-            long customTtlMillis = (customResultIndexTtl != null) ? customResultIndexTtl * 24 * 60 * 60 * 1000L : Long.MAX_VALUE;
             for (IndexMetadata indexMetaData : clusterStateResponse.getState().metadata().indices().values()) {
                 long creationTime = indexMetaData.getCreationDate();
                 long indexAgeMillis = Instant.now().toEpochMilli() - creationTime;
-                if (indexAgeMillis > historyRetentionPeriod.millis() || indexAgeMillis > customTtlMillis) {
+                if (indexAgeMillis > historyRetentionPeriod.millis()) {
                     String indexName = indexMetaData.getIndex().getName();
+                    System.out.println("indexName: " + indexName);
                     candidates.add(indexName);
                     if (latest < creationTime) {
                         latest = creationTime;
@@ -317,7 +318,7 @@ protected void deleteOldHistoryIndices(String indexPattern, TimeValue historyRet
             }
             if (candidates.size() > 1) {
                 // delete all indices except the last one because the last one may contain docs newer than the retention period
-                candidates.remove(latestToDelete);
+                //candidates.remove(latestToDelete);
                 String[] toDelete = candidates.toArray(Strings.EMPTY_ARRAY);
                 DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(toDelete);
                 adminClient.indices().delete(deleteIndexRequest, ActionListener.wrap(deleteIndexResponse -> {
@@ -1085,7 +1086,7 @@ public void onClusterManager() {
 
             // schedule the next rollover for approx MAX_AGE later
             scheduledRollover = threadPool
-                    .scheduleWithFixedDelay(() -> rolloverAndDeleteHistoryIndex(), TimeValue.timeValueMinutes(5), executorName());
+                    .scheduleWithFixedDelay(() -> rolloverAndDeleteHistoryIndex(), TimeValue.timeValueMinutes(1), executorName());
         } catch (Exception e) {
             // This should be run on cluster startup
             logger.error("Error rollover result indices. " + "Can't rollover result until clusterManager node is restarted.", e);
@@ -1108,7 +1109,6 @@ protected void rescheduleRollover() {
             if (scheduledRollover != null) {
                 scheduledRollover.cancel();
             }
-            System.out.println(5);
 
             scheduledRollover = threadPool
                 .scheduleWithFixedDelay(() -> rolloverAndDeleteHistoryIndex(), historyRolloverPeriod, executorName());
@@ -1244,13 +1244,9 @@ protected void rolloverAndDeleteHistoryIndex(
         String rolloverIndexPattern,
         IndexType resultIndex
     ) {
-        System.out.println("resultIndexAlias: " + resultIndexAlias);
-        System.out.println("allResultIndicesPattern: " + allResultIndicesPattern);
-        System.out.println("rolloverIndexPattern: " + rolloverIndexPattern);
-        System.out.println("resultIndex: " + resultIndex.getIndexName());
-
         // build rollover request for default result index
         RolloverRequest defaultResultIndexRolloverRequest = buildRolloverRequest(resultIndexAlias, rolloverIndexPattern);
+        defaultResultIndexRolloverRequest.addMaxIndexDocsCondition(historyMaxDocs * getNumberOfPrimaryShards());
 
         // get config files that have custom result index alias to perform rollover on
         getConfigsWithCustomResultIndexAlias(ActionListener.wrap(candidateResultAliases -> {
@@ -1271,8 +1267,6 @@ protected void rolloverAndDeleteHistoryIndex(
                 return;
             }
 
-            System.out.println("size: " + candidateResultAliases.size());
-
             // perform rollover and delete on found custom result index alias
             candidateResultAliases.forEach(config -> handleCustomResultIndex(config, resultIndex));
 
@@ -1284,8 +1278,6 @@ protected void rolloverAndDeleteHistoryIndex(
     }
 
     private void handleCustomResultIndex(Config config, IndexType resultIndex) {
-        System.out.println("detector name: " + config.getName());
-        System.out.println("custom index name: " + config.getCustomResultIndexOrAlias());
         RolloverRequest rolloverRequest = buildRolloverRequest(
             config.getCustomResultIndexOrAlias(),
             getCustomResultIndexPattern(config.getCustomResultIndexOrAlias())
@@ -1293,7 +1285,7 @@ private void handleCustomResultIndex(Config config, IndexType resultIndex) {
 
         // add rollover conditions if found in config
         if (config.getCustomResultIndexMinAge() != null) {
-            rolloverRequest.addMaxIndexAgeCondition(TimeValue.timeValueMinutes(10));
+            rolloverRequest.addMaxIndexAgeCondition(TimeValue.timeValueMinutes(1));
 
 //            rolloverRequest.addMaxIndexAgeCondition(TimeValue.timeValueDays(config.getCustomResultIndexMinAge()));
         }
@@ -1326,7 +1318,6 @@ private RolloverRequest buildRolloverRequest(String resultIndexAlias, String rol
 
         createRequest.index(rolloverIndexPattern).mapping(resultMapping, XContentType.JSON);
         choosePrimaryShards(createRequest, true);
-        rollOverRequest.addMaxIndexDocsCondition(historyMaxDocs * getNumberOfPrimaryShards());
 
         return rollOverRequest;
     }
@@ -1345,7 +1336,17 @@ private void proceedWithRolloverAndDelete(
                 IndexState indexState = indexStates.computeIfAbsent(resultIndex, k -> new IndexState(k.getMapping()));
                 indexState.mappingUpToDate = true;
                 logger.info("{} rolled over. Conditions were: {}", resultIndexAlias, response.getConditionStatus());
-                deleteOldHistoryIndices(allResultIndicesPattern, historyRetentionPeriod, customResultIndexTtl);
+                if (resultIndexAlias.startsWith(ADCommonName.CUSTOM_RESULT_INDEX_PREFIX) || resultIndexAlias.startsWith(CUSTOM_RESULT_INDEX_PREFIX)) {
+                    // handle custom result index deletion
+                    if (customResultIndexTtl != null) {
+//                        deleteOldHistoryIndices(allResultIndicesPattern, TimeValue.timeValueHours(customResultIndexTtl * 24));
+                        deleteOldHistoryIndices(allResultIndicesPattern, TimeValue.timeValueMinutes(1));
+
+                    }
+                } else {
+                    // handle default result index deletion
+                    deleteOldHistoryIndices(allResultIndicesPattern, historyRetentionPeriod);
+                }
             }
         }, exception -> { logger.error("Fail to roll over result index", exception); }));
     }