diff --git a/mobile/android/base/moz.build b/mobile/android/base/moz.build
index 8b2673e89e5c..6d8ff304e5c9 100644
--- a/mobile/android/base/moz.build
+++ b/mobile/android/base/moz.build
@@ -29,7 +29,7 @@ with Files('java/org/mozilla/gecko/activitystream/**'):
     BUG_COMPONENT = ('Firefox for Android', 'Awesomescreen')
 
 with Files('java/org/mozilla/gecko/cleanup/**'):
-    BUG_COMPONENT = ('Android Background Services', 'Firefox Health Report Service')
+    BUG_COMPONENT = ('Firefox for Android', 'Firefox Health Report Service')
 
 with Files('java/org/mozilla/gecko/distribution/**'):
     BUG_COMPONENT = ('Firefox for Android', 'Distributions')
diff --git a/mobile/android/moz.build b/mobile/android/moz.build
index 5273b9577a2d..f5cfa260b6ec 100644
--- a/mobile/android/moz.build
+++ b/mobile/android/moz.build
@@ -33,7 +33,7 @@ with Files('gradle/**'):
     BUG_COMPONENT = ('Firefox for Android', 'Build Config & IDE Support')
 
 with Files('services/**'):
-    BUG_COMPONENT = ('Android Background Services', 'Android Sync')
+    BUG_COMPONENT = ('Firefox for Android', 'Android Sync')
 
 with Files('themes/**'):
     BUG_COMPONENT = ('Firefox for Android', 'Theme and Visual Design')
diff --git a/mobile/android/stumbler/moz.build b/mobile/android/stumbler/moz.build
index b954655ec967..f37a72d23b7c 100644
--- a/mobile/android/stumbler/moz.build
+++ b/mobile/android/stumbler/moz.build
@@ -5,4 +5,4 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Android Background Services', 'Geolocation')
+    BUG_COMPONENT = ('Firefox for Android', 'General')