diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/util/destinationmigration/DestinationMigrationUtilService.kt b/alerting/src/main/kotlin/org/opensearch/alerting/util/destinationmigration/DestinationMigrationUtilService.kt
index b225a1e93..898561142 100644
--- a/alerting/src/main/kotlin/org/opensearch/alerting/util/destinationmigration/DestinationMigrationUtilService.kt
+++ b/alerting/src/main/kotlin/org/opensearch/alerting/util/destinationmigration/DestinationMigrationUtilService.kt
@@ -64,17 +64,25 @@ class DestinationMigrationUtilService {
             try {
                 runningLock = true
 
-                val destinationsToMigrate = retrieveDestinationsToMigrate(client)
-                logger.info("Need to migrate ${destinationsToMigrate.size} destinations")
-                if (destinationsToMigrate.isEmpty()) {
+                val emailAccountsToMigrate = retrieveConfigsToMigrate(client, "email_account")
+                val emailGroupsToMigrate = retrieveConfigsToMigrate(client, "email_group")
+                val destinationsToMigrate = retrieveConfigsToMigrate(client, "destination")
+                val configsToMigrate = emailAccountsToMigrate + emailGroupsToMigrate + destinationsToMigrate
+                logger.info(
+                    "Need to migrate ${emailAccountsToMigrate.size} email accounts, " +
+                        "${emailGroupsToMigrate.size} email groups and " +
+                        "${destinationsToMigrate.size} destinations " +
+                        "(${configsToMigrate.size} configs total)"
+                )
+                if (configsToMigrate.isEmpty()) {
                     finishFlag = true
                     runningLock = false
                     return
                 }
-                val migratedDestinations = createNotificationChannelIfNotExists(client, destinationsToMigrate)
-                logger.info("Migrated ${migratedDestinations.size} destinations")
-                val failedDeletedDestinations = deleteOldDestinations(client, migratedDestinations)
-                logger.info("Failed to delete ${failedDeletedDestinations.size} destinations from migration process cleanup")
+                val migratedConfigs = createNotificationChannelIfNotExists(client, configsToMigrate)
+                logger.info("Migrated ${migratedConfigs.size} configs")
+                val failedDeleteConfigs = deleteOldDestinations(client, migratedConfigs)
+                logger.info("Failed to delete ${failedDeleteConfigs.size} configs from migration process cleanup")
             } finally {
                 runningLock = false
             }
@@ -136,7 +144,7 @@ class DestinationMigrationUtilService {
             return migratedNotificationConfigs
         }
 
-        private suspend fun retrieveDestinationsToMigrate(client: NodeClient): List<Pair<NotificationConfigInfo, String>> {
+        private suspend fun retrieveConfigsToMigrate(client: NodeClient, configName: String): List<Pair<NotificationConfigInfo, String>> {
             var start = 0
             val size = 100
             val notificationConfigInfoList = mutableListOf<Pair<NotificationConfigInfo, String>>()
@@ -150,9 +158,7 @@ class DestinationMigrationUtilService {
                     .seqNoAndPrimaryTerm(true)
                     .version(true)
                 val queryBuilder = QueryBuilders.boolQuery()
-                    .should(QueryBuilders.existsQuery("email_account"))
-                    .should(QueryBuilders.existsQuery("email_group"))
-                    .should(QueryBuilders.existsQuery("destination"))
+                    .should(QueryBuilders.existsQuery(configName))
                 searchSourceBuilder.query(queryBuilder)
 
                 val searchRequest = SearchRequest()
@@ -161,7 +167,7 @@ class DestinationMigrationUtilService {
                 val response: SearchResponse = client.suspendUntil { client.search(searchRequest, it) }
 
                 if (response.status() != RestStatus.OK) {
-                    logger.error("Failed to retrieve destinations to migrate")
+                    logger.error("Failed to retrieve ${configName}s to migrate")
                     hasMoreResults = false
                 } else {
                     if (response.hits.hits.isEmpty()) {
@@ -170,18 +176,18 @@ class DestinationMigrationUtilService {
                     for (hit in response.hits) {
                         val xcp = XContentFactory.xContent(XContentType.JSON)
                             .createParser(NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, hit.sourceAsString)
-                        var notificationConfig: NotificationConfig?
+                        var notificationConfig: NotificationConfig? = null
                         var userStr = ""
-                        when {
-                            hit.sourceAsString.contains("\"email_group\"") -> {
+                        when (configName) {
+                            "email_group" -> {
                                 val emailGroup = EmailGroup.parseWithType(xcp, hit.id, hit.version)
                                 notificationConfig = convertEmailGroupToNotificationConfig(emailGroup)
                             }
-                            hit.sourceAsString.contains("\"email_account\"") -> {
+                            "email_account" -> {
                                 val emailAccount = EmailAccount.parseWithType(xcp, hit.id, hit.version)
                                 notificationConfig = convertEmailAccountToNotificationConfig(emailAccount)
                             }
-                            else -> {
+                            "destination" -> {
                                 XContentParserUtils.ensureExpectedToken(XContentParser.Token.START_OBJECT, xcp.nextToken(), xcp)
                                 XContentParserUtils.ensureExpectedToken(XContentParser.Token.FIELD_NAME, xcp.nextToken(), xcp)
                                 XContentParserUtils.ensureExpectedToken(XContentParser.Token.START_OBJECT, xcp.nextToken(), xcp)
@@ -195,6 +201,7 @@ class DestinationMigrationUtilService {
                                 userStr = destination.user.toString()
                                 notificationConfig = convertDestinationToNotificationConfig(destination)
                             }
+                            else -> logger.info("Unrecognized config name [$configName] to migrate")
                         }
 
                         if (notificationConfig != null)