diff --git a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java
index 56589e10f1e..ad6bc36f6ce 100644
--- a/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java
+++ b/buildSrc/src/main/java/com/google/firebase/gradle/bomgenerator/BomGeneratorTask.java
@@ -58,14 +58,12 @@ public class BomGeneratorTask extends DefaultTask {
           "com.google.firebase:firebase-appcheck-playintegrity",
           "com.google.firebase:firebase-appcheck-safetynet",
           "com.google.firebase:firebase-appcheck",
-          "com.google.firebase:firebase-appindexing",
           "com.google.firebase:firebase-auth",
           "com.google.firebase:firebase-auth-ktx",
           "com.google.firebase:firebase-common",
           "com.google.firebase:firebase-common-ktx",
           "com.google.firebase:firebase-config",
           "com.google.firebase:firebase-config-ktx",
-          "com.google.firebase:firebase-core",
           "com.google.firebase:firebase-crashlytics",
           "com.google.firebase:firebase-crashlytics-ktx",
           "com.google.firebase:firebase-crashlytics-ndk",
@@ -78,7 +76,6 @@ public class BomGeneratorTask extends DefaultTask {
           "com.google.firebase:firebase-firestore-ktx",
           "com.google.firebase:firebase-functions",
           "com.google.firebase:firebase-functions-ktx",
-          "com.google.firebase:firebase-iid",
           "com.google.firebase:firebase-inappmessaging",
           "com.google.firebase:firebase-inappmessaging-display",
           "com.google.firebase:firebase-inappmessaging-display-ktx",
@@ -109,6 +106,9 @@ public class BomGeneratorTask extends DefaultTask {
           "firebase-appcheck-interop",
           "firebase-appdistribution-gradle",
           "firebase-appindexing-license",
+          "firebase-appindexing",
+          "firebase-iid",
+          "firebase-core",
           "firebase-auth-common",
           "firebase-auth-impl",
           "firebase-auth-interop",