diff --git a/browser/config/mozconfigs/linux64/opt-static-analysis-clang b/browser/config/mozconfigs/linux64/opt-static-analysis-clang
deleted file mode 100644
index 3b7df063d16a..000000000000
--- a/browser/config/mozconfigs/linux64/opt-static-analysis-clang
+++ /dev/null
@@ -1,20 +0,0 @@
-MOZ_AUTOMATION_BUILD_SYMBOLS=0
-MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_L10N_CHECK=0
-
-. "$topsrcdir/build/mozconfig.common"
-
-ac_add_options --enable-dmd
-
-. $topsrcdir/build/mozconfig.stylo
-
-# Use Clang as specified in manifest
-CC="$topsrcdir/clang/bin/clang"
-CXX="$topsrcdir/clang/bin/clang++"
-
-# Add the static checker
-ac_add_options --enable-clang-plugin
-
-. "$topsrcdir/build/unix/mozconfig.stdcxx"
-
-. "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/linux64/tup b/browser/config/mozconfigs/linux64/tup
index d5d65b781a01..359333b52afc 100644
--- a/browser/config/mozconfigs/linux64/tup
+++ b/browser/config/mozconfigs/linux64/tup
@@ -14,6 +14,7 @@ export TUP=${TOOLTOOL_DIR}/tup/tup
 
 ac_add_options --enable-build-backends=Tup
 ac_add_options --disable-js-shell
+unset ENABLE_CLANG_PLUGIN
 # To enable the option to upload the tup database, uncomment the line below
 # ac_add_options --upload-tup-db
 
diff --git a/build/mozconfig.no-compile b/build/mozconfig.no-compile
index 1dd913907b81..0a83e9551361 100644
--- a/build/mozconfig.no-compile
+++ b/build/mozconfig.no-compile
@@ -23,5 +23,6 @@ unset BINDGEN_CFLAGS
 unset LLVM_CONFIG
 unset WIN64_LINK
 unset WIN64_LIB
+unset ENABLE_CLANG_PLUGIN
 
 unset MOZ_STDCXX_COMPAT
diff --git a/build/unix/mozconfig.linux b/build/unix/mozconfig.linux
index 620ea6fbf036..4f73ef43dbb6 100644
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -13,6 +13,7 @@ if [ -n "$FORCE_GCC" -o -n "$MOZ_PGO" ]; then
 else
     CC="$TOOLTOOL_DIR/clang/bin/clang"
     CXX="$TOOLTOOL_DIR/clang/bin/clang++"
+    export ENABLE_CLANG_PLUGIN=1
 fi
 
 # We want to make sure we use binutils and other binaries in the tooltool
diff --git a/taskcluster/ci/static-analysis/kind.yml b/taskcluster/ci/static-analysis/kind.yml
index 240f55c7a3d2..aa21ec84ca73 100644
--- a/taskcluster/ci/static-analysis/kind.yml
+++ b/taskcluster/ci/static-analysis/kind.yml
@@ -23,60 +23,6 @@ job-defaults:
         tier: 1
 
 jobs:
-    linux64-st-an/debug:
-        description: "Linux64 Debug Static Analysis"
-        index:
-            job-name: linux64-st-an-debug
-        treeherder:
-            platform: linux64/debug
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
-        worker:
-            max-run-time: 36000
-            env:
-                PERFHERDER_EXTRA_OPTIONS: static-analysis
-        run:
-            using: mozharness
-            actions: [build]
-            config:
-                - builds/releng_base_firefox.py
-                - builds/releng_sub_linux_configs/64_stat_and_debug.py
-            script: "mozharness/scripts/fx_desktop_build.py"
-            tooltool-downloads: public
-            keep-artifacts: false
-        toolchains:
-            - linux64-clang
-            - linux64-rust
-            - linux64-cbindgen
-            - linux64-sccache
-            - linux64-node
-
-    linux64-st-an/opt:
-        description: "Linux64 Opt Static Analysis"
-        index:
-            job-name: linux64-st-an-opt
-        treeherder:
-            platform: linux64/opt
-        worker-type: aws-provisioner-v1/gecko-{level}-b-linux
-        worker:
-            max-run-time: 36000
-            env:
-                PERFHERDER_EXTRA_OPTIONS: static-analysis
-        run:
-            using: mozharness
-            actions: [build]
-            config:
-                - builds/releng_base_firefox.py
-                - builds/releng_sub_linux_configs/64_stat_and_opt.py
-            script: "mozharness/scripts/fx_desktop_build.py"
-            tooltool-downloads: public
-            keep-artifacts: false
-        toolchains:
-            - linux64-clang
-            - linux64-rust
-            - linux64-cbindgen
-            - linux64-sccache
-            - linux64-node
-
     win32-st-an/debug:
         description: "Win32 Static Analysis Debug (clang-cl)"
         index:
diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
deleted file mode 100644
index 1ada77a335e5..000000000000
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_stat_and_opt.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import os
-
-config = {
-    # note: overridden by MOZHARNESS_ACTIONS in TaskCluster tasks
-    'default_actions': [
-        'clobber',
-        'build',
-    ],
-    'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
-    # decides whether we want to use moz_sign_cmd in env
-    'vcs_share_base': '/builds/hg-shared',
-    #########################################################################
-
-
-    #########################################################################
-    ###### 64 bit specific ######
-    'base_name': 'Linux_x86-64_%(branch)s_Static_Analysis',
-    'platform': 'linux64',
-    'stage_platform': 'linux64-st-an',
-    'env': {
-        'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
-        'DISPLAY': ':2',
-        'HG_SHARE_BASE_DIR': '/builds/hg-shared',
-        'MOZ_OBJDIR': '%(abs_obj_dir)s',
-        'TINDERBOX_OUTPUT': '1',
-        'TOOLTOOL_CACHE': '/builds/worker/tooltool-cache',
-        'TOOLTOOL_HOME': '/builds',
-        'MOZ_CRASHREPORTER_NO_REPORT': '1',
-        'LC_ALL': 'C',
-        ## 64 bit specific
-        'PATH': '/usr/local/bin:/bin:\
-/usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
-        ##
-    },
-    # This doesn't actually inherit from anything.
-    'mozconfig_platform': 'linux64',
-    'mozconfig_variant': 'opt-static-analysis-clang',
-    #######################
-    'artifact_flag_build_variant_in_try': None,
-}