diff --git a/taskcluster/ci/build/android.yml b/taskcluster/ci/build/android.yml
index b2b86e4f0769..35e662e3150a 100644
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -112,7 +112,7 @@ android-x86-fuzzing/debug:
             - linux64-clang
             - linux64-sccache
     optimization:
-        build-fuzzing: null
+        skip-unless-expanded: null
 
 android-x86-shippable/opt:
     description: "Android 4.2 x86 Shippable"
@@ -565,4 +565,4 @@ android-x86_64-asan-fuzzing/opt:
             - linux64-clang-android-cross
             - linux64-sccache
     optimization:
-        build-fuzzing: null
+        skip-unless-expanded: null
diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml
index 564490f63542..a0329f455c51 100644
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -132,7 +132,7 @@ linux64-fuzzing/debug:
             # this dependency can be removed.
             - linux64-fix-stacks
     optimization:
-        build-fuzzing: null
+        skip-unless-expanded: null
 
 linux64/debug:
     description: "Linux64 Debug"
@@ -772,7 +772,7 @@ linux64-tsan-fuzzing/opt:
             - linux64-lucetc
             - wasi-sysroot
     optimization:
-        build-fuzzing: null
+        skip-unless-expanded: null
 
 linux64-asan-fuzzing/opt:
     description: "Linux64 Fuzzing Opt ASAN"
@@ -819,7 +819,7 @@ linux64-asan-fuzzing/opt:
             - linux64-lucetc
             - wasi-sysroot
     optimization:
-        build-fuzzing: null
+        skip-unless-expanded: null
 
 linux64-asan-fuzzing-ccov/opt:
     description: "Linux64 Fuzzing Opt ASAN w/ Coverage"
@@ -911,7 +911,7 @@ linux64-fuzzing-ccov/opt:
             - linux64-lucetc
             - wasi-sysroot-9
     optimization:
-        build-fuzzing: null
+        skip-unless-expanded: null
 
 linux64-asan-reporter-shippable/opt:
     description: "Linux64 Opt ASAN Reporter (Shippable)"
diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml
index df7d9331d349..5d9f137a0aef 100644
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -111,7 +111,7 @@ macosx64-asan-fuzzing/opt:
             - linux64-sccache
             - wasi-sysroot
     optimization:
-        build-fuzzing: null
+        skip-unless-expanded: null
 
 macosx64-fuzzing/debug:
     description: "MacOS X x64 Cross-compile Fuzzing Debug"
@@ -140,7 +140,7 @@ macosx64-fuzzing/debug:
             - linux64-sccache
             - wasi-sysroot
     optimization:
-        build-fuzzing: null
+        skip-unless-expanded: null
 
 macosx64-devedition/opt:
     description: "MacOS X Dev Edition x64 (shippable)"
diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml
index 87ad9176a8b3..0b4f955c3be2 100644
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -210,7 +210,7 @@ win64-fuzzing/debug:
             - win64-node
             - win64-winchecksec
     optimization:
-        build-fuzzing: null
+        skip-unless-expanded: null
 
 win64-plain/debug:
     description: "Win64 Debug Plain"
@@ -1051,7 +1051,7 @@ win64-asan-fuzzing/opt:
             - win64-node
             - win64-winchecksec
     optimization:
-        build-fuzzing: null
+        skip-unless-expanded: null
 
 win32-devedition/opt:
     description: "Win32 Dev Edition (shippable)"
diff --git a/taskcluster/taskgraph/optimize/__init__.py b/taskcluster/taskgraph/optimize/__init__.py
index 90b6be8381ff..e5ad6c755751 100644
--- a/taskcluster/taskgraph/optimize/__init__.py
+++ b/taskcluster/taskgraph/optimize/__init__.py
@@ -510,7 +510,6 @@ import_sibling_modules()
 
 # Register composite strategies.
 register_strategy('build', args=('skip-unless-schedules',))(Alias)
-register_strategy('build-fuzzing', args=('skip-unless-expanded',))(Alias)
 register_strategy('test', args=('skip-unless-schedules',))(Alias)
 register_strategy('test-inclusive', args=('skip-unless-schedules',))(Alias)
 register_strategy('test-verify', args=('skip-unless-schedules',))(Alias)
@@ -732,7 +731,6 @@ class ExperimentalOverride(object):
 
 tryselect = ExperimentalOverride(experimental, {
     'build': Any('skip-unless-schedules', 'bugbug-reduced', split_args=split_bugbug_arg),
-    'build-fuzzing': Alias('bugbug-reduced'),
     'test-verify': 'base:test',
     'upload-symbols': Alias('always'),
 })
diff --git a/taskcluster/taskgraph/optimize/schema.py b/taskcluster/taskgraph/optimize/schema.py
index 3865dddc081e..04b1e063691a 100644
--- a/taskcluster/taskgraph/optimize/schema.py
+++ b/taskcluster/taskgraph/optimize/schema.py
@@ -20,7 +20,6 @@ default_optimizations = (
     {'always': None},
     # optimize strategy aliases for build kind
     {'build': list(schedules.ALL_COMPONENTS)},
-    {'build-fuzzing': None},
     # search the index for the given index namespaces, and replace this task if found
     # the search occurs in order, with the first match winning
     {'index-search': [text_type]},