--- a/taskcluster/moz.build
+++ b/taskcluster/moz.build
@@ -1,32 +1,16 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 with Files('**'):
-    BUG_COMPONENT = ('Taskcluster', 'General')
-
-with Files('ci/**'):
-    BUG_COMPONENT = ('Taskcluster', 'Task Configuration')
-
-with Files('docker/**'):
-    BUG_COMPONENT = ('Taskcluster', 'Docker Images')
-
-with Files('docs/**'):
-    BUG_COMPONENT = ('Taskcluster', 'Documentation')
-
-#NOTE: scripts/* files included in docker images
-with Files('scripts/**'):
-    BUG_COMPONENT = ('Taskcluster', 'Docker Images')
-
-with Files('taskgraph/**'):
-    BUG_COMPONENT = ('Taskcluster', 'Task Configuration')
+    BUG_COMPONENT = ('Firefox Build System', 'Task Configuration')
 
 PYTHON_UNITTEST_MANIFESTS += [
     'taskgraph/test/python.ini',
 ]
 SPHINX_TREES['taskcluster'] = 'docs'
 SPHINX_PYTHON_PACKAGE_DIRS += ['taskgraph']
 
 with Files('docs/**'):

--- a/third_party/python/moz.build
+++ b/third_party/python/moz.build
@@ -7,17 +7,17 @@
 # Default extra components to build config
 with Files('**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('PyECC/**'):
     BUG_COMPONENT = ('Core', 'Security: PSM')
 
 with Files('attrs/**'):
-    BUG_COMPONENT = ('Taskcluster', 'Task Configuration')
+    BUG_COMPONENT = ('Firefox Build System', 'Task Configuration')
 
 with Files('blessings/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('compare-locales/**'):
     BUG_COMPONENT = ('Localization Infrastructure and Tools', 'compare-locales')
 
 with Files('configobj/**'):
@@ -79,12 +79,12 @@ with Files('rsa/**'):
 
 with Files('slugid/**'):
     BUG_COMPONENT = ('Taskcluster', 'Platform Libraries')
 
 with Files('virtualenv/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')
 
 with Files('voluptuous/**'):
-    BUG_COMPONENT = ('Taskcluster', 'Task Configuration')
+    BUG_COMPONENT = ('Firefox Build System', 'Task Configuration')
 
 with Files('which/**'):
     BUG_COMPONENT = ('Firefox Build System', 'General')