diff --git a/packages/build/tests/core/snapshots/tests.js.md b/packages/build/tests/core/snapshots/tests.js.md
index 1550a70243..f492542cc4 100644
--- a/packages/build/tests/core/snapshots/tests.js.md
+++ b/packages/build/tests/core/snapshots/tests.js.md
@@ -683,7 +683,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/build/tests/core/fixtures/basereldir/base",␊
       "config": {␊
diff --git a/packages/build/tests/core/snapshots/tests.js.snap b/packages/build/tests/core/snapshots/tests.js.snap
index e78d6f6dcd..dcdb301de0 100644
Binary files a/packages/build/tests/core/snapshots/tests.js.snap and b/packages/build/tests/core/snapshots/tests.js.snap differ
diff --git a/packages/config/README.md b/packages/config/README.md
index 2e59d0fff6..e806789ba1 100644
--- a/packages/config/README.md
+++ b/packages/config/README.md
@@ -47,7 +47,6 @@ const exampleFunction = async function () {
   //   },
   //   ...
   // ],
-  // "addons": [],
   // "env": {
   //   "NODE_VERSION": { "sources": ["configFile"], "value": "16" },
   //   ...
@@ -117,7 +116,7 @@ Path to the `netlify.toml`. It is either an absolute path or a path relative to
 If not specified, it is searched in the following directories (by highest priority order):
 
 - `base` directory
-- [`repositoryRoot`](#repositoryRoot)
+- [`repositoryRoot`](#repositoryroot)
 - current directory
 - any parent directory
 
@@ -205,7 +204,7 @@ _Default value_: environment variable `NETLIFY_SITE_ID`
 
 Netlify Site ID.
 
-This is used to retrieve [`siteInfo`](#siteinfo), [`accounts`](#accounts) and [`addons`](#addons).
+This is used to retrieve [`siteInfo`](#siteinfo) and [`accounts`](#accounts).
 
 #### env
 
@@ -227,8 +226,8 @@ What is calling `@netlify/config`. Can be:
 
 This is used for the following cases:
 
-- if `mode` is `buildbot`, [`siteInfo`](#siteinfo), [`accounts`](#accounts) and [`addons`](#addons) are not retrieved
-  because they are also passed using another internal option.
+- if `mode` is `buildbot`, [`siteInfo`](#siteinfo) and [`accounts`](#accounts) are not retrieved because they are also
+  passed using another internal option.
 
 #### defaultConfig
 
@@ -287,13 +286,13 @@ _Type_: `string`
 Absolute path to the build directory.
 
 The build directory is the current directory in which most build operations, including the build command, execute. It is
-usually either the [`repositoryRoot`](#repositoryRoot) or (if specified) the `base` directory.
+usually either the [`repositoryRoot`](#repositoryroot) or (if specified) the `base` directory.
 
 #### repositoryRoot
 
 _Type_: `string`
 
-The computed value of [`repositoryRoot`](#repositoryRoot).
+The computed value of [`repositoryRoot`](#repositoryroot).
 
 #### context
 
@@ -326,15 +325,6 @@ environment variables.
 
 This might be empty depending on the options passed.
 
-#### addons
-
-_Type_: `object[]`
-
-Netlify addons retrieved using the `listServiceInstancesForSite` Netlify API endpoint. This is used to retrieve
-addon-specific environment variables.
-
-This might be empty depending on the options passed.
-
 #### token
 
 _Type_: `string`
@@ -346,8 +336,8 @@ variables.
 
 _Type_: `NetlifyClient?`
 
-Netlify [JavaScript client instance](https://github.com/netlify/js-client) used to retrieve [`siteInfo`](#siteinfo),
-[`accounts`](#accounts) and [`addons`](#addons).
+Netlify [JavaScript client instance](https://github.com/netlify/js-client) used to retrieve [`siteInfo`](#siteinfo) and
+[`accounts`](#accounts).
 
 #### logs
 
@@ -365,14 +355,13 @@ Site's environment variables. Each environment variable value is an object with
 - `sources` `string[]` among:
   - `general`: general environment variables set for all sites
   - `account`: environment variables set in the Netlify UI for a specific account
-  - `addons`: addon-specific environment variables
   - `ui`: environment variables set in the Netlify UI for a specific site
   - `configFile`: environment variables set in `netlify.toml`
 
 # Usage (CLI)
 
 ```bash
-$ netlify-config
+netlify-config
 ```
 
 Like [`resolveConfig()`](resolveconfig), but in the CLI. The return value is printed on `stdout`.
diff --git a/packages/config/src/api/site_info.ts b/packages/config/src/api/site_info.ts
index f0229d1c7b..07b644674f 100644
--- a/packages/config/src/api/site_info.ts
+++ b/packages/config/src/api/site_info.ts
@@ -71,13 +71,12 @@ export const getSiteInfo = async function ({
           })
         : []
 
-    return { siteInfo, accounts: [], addons: [], integrations }
+    return { siteInfo, accounts: [], integrations }
   }
 
-  const [siteInfo, accounts, addons, integrations] = await Promise.all([
+  const [siteInfo, accounts, integrations] = await Promise.all([
     getSite(api, siteId, siteFeatureFlagPrefix),
     getAccounts(api),
-    getAddons(api, siteId),
     getIntegrations({ siteId, testOpts, offline, accountId, token, featureFlags, extensionApiBaseUrl, mode }),
   ])
 
@@ -87,7 +86,7 @@ export const getSiteInfo = async function ({
     siteInfo.build_settings.env = envelope
   }
 
-  return { siteInfo, accounts, addons, integrations }
+  return { siteInfo, accounts, integrations }
 }
 
 const getSite = async function (api: NetlifyAPI, siteId: string, siteFeatureFlagPrefix: string) {
@@ -128,19 +127,6 @@ const getAccounts = async function (api: NetlifyAPI): Promise<MinimalAccount[]>
   }
 }
 
-const getAddons = async function (api: NetlifyAPI, siteId: string) {
-  if (siteId === undefined) {
-    return []
-  }
-
-  try {
-    const addons = await (api as any).listServiceInstancesForSite({ siteId })
-    return Array.isArray(addons) ? addons : []
-  } catch (error) {
-    throwUserError(`Failed retrieving addons for site ${siteId}: ${error.message}. ${ERROR_CALL_TO_ACTION}`)
-  }
-}
-
 type GetIntegrationsOpts = {
   siteId?: string
   accountId?: string
diff --git a/packages/config/src/env/main.ts b/packages/config/src/env/main.ts
index 84454b7eb7..45df10149d 100644
--- a/packages/config/src/env/main.ts
+++ b/packages/config/src/env/main.ts
@@ -7,7 +7,7 @@ import { getEnvelope } from './envelope.js'
 import { getGitEnv } from './git.js'
 
 // Retrieve this site's environment variable. Also take into account team-wide
-// environment variables and addons.
+// environment variables.
 // The buildbot already has the right environment variables. This is mostly
 // meant so that local builds can mimic production builds
 // TODO: add `netlify.toml` `build.environment`, after normalization
@@ -18,7 +18,6 @@ export const getEnv = async function ({
   config,
   siteInfo,
   accounts,
-  addons,
   buildDir,
   branch,
   deployId,
@@ -32,12 +31,11 @@ export const getEnv = async function ({
 
   const internalEnv = getInternalEnv(cachedEnv)
   const generalEnv = await getGeneralEnv({ siteInfo, buildDir, branch, deployId, buildId, context })
-  const [accountEnv, addonsEnv, uiEnv, configFileEnv] = await getUserEnv({
+  const [accountEnv, uiEnv, configFileEnv] = await getUserEnv({
     api,
     config,
     siteInfo,
     accounts,
-    addons,
     context,
   })
 
@@ -45,7 +43,6 @@ export const getEnv = async function ({
   const sources = [
     { key: 'configFile', values: configFileEnv },
     { key: 'ui', values: uiEnv },
-    { key: 'addons', values: addonsEnv },
     { key: 'account', values: accountEnv },
     { key: 'general', values: generalEnv },
     { key: 'internal', values: internalEnv },
@@ -164,12 +161,11 @@ const NETLIFY_DEFAULT_DOMAIN = '.netlify.app'
 const DEFAULT_SITE_NAME = 'site-name'
 
 // Environment variables specified by the user
-const getUserEnv = async function ({ api, config, siteInfo, accounts, addons, context }) {
+const getUserEnv = async function ({ api, config, siteInfo, accounts, context }) {
   const accountEnv = await getAccountEnv({ api, siteInfo, accounts, context })
-  const addonsEnv = getAddonsEnv(addons)
   const uiEnv = getUiEnv({ siteInfo })
   const configFileEnv = getConfigFileEnv({ config })
-  return [accountEnv, addonsEnv, uiEnv, configFileEnv].map(cleanUserEnv)
+  return [accountEnv, uiEnv, configFileEnv].map(cleanUserEnv)
 }
 
 // Account-wide environment variables
@@ -191,15 +187,6 @@ const getAccountEnv = async function ({
   return siteEnv
 }
 
-// Environment variables from addons
-const getAddonsEnv = function (addons) {
-  return Object.assign({}, ...addons.map(getAddonEnv))
-}
-
-const getAddonEnv = function ({ env }) {
-  return env
-}
-
 // Site-specific environment variables set in the UI
 const getUiEnv = function ({ siteInfo: { build_settings: { env = {} } = {} } }) {
   return env
diff --git a/packages/config/src/main.ts b/packages/config/src/main.ts
index 918e047e0a..857592951c 100644
--- a/packages/config/src/main.ts
+++ b/packages/config/src/main.ts
@@ -26,7 +26,6 @@ import { getRedirectsPath, addRedirects } from './redirects.js'
 
 export type Config = {
   accounts: MinimalAccount[] | undefined
-  addons: any
   api: any
   branch: any
   buildDir: any
@@ -99,16 +98,14 @@ export const resolveConfig = async function (opts): Promise<Config> {
     featureFlags,
   } = await normalizeOpts(optsA)
 
-  let { siteInfo, accounts, addons, integrations } = parsedCachedConfig || {}
+  let { siteInfo, accounts, integrations } = parsedCachedConfig || {}
 
   // If we have cached site info, we don't need to fetch it again
-  const useCachedSiteInfo = Boolean(
-    featureFlags?.use_cached_site_info && siteInfo && accounts && addons && integrations,
-  )
+  const useCachedSiteInfo = Boolean(featureFlags?.use_cached_site_info && siteInfo && accounts && integrations)
 
   // I'm adding some debug logging to see if the logic is working as expected
   if (featureFlags?.use_cached_site_info_logging) {
-    console.log('Checking site information', { useCachedSiteInfo, siteInfo, accounts, addons, integrations })
+    console.log('Checking site information', { useCachedSiteInfo, siteInfo, accounts, integrations })
   }
 
   if (!useCachedSiteInfo) {
@@ -128,7 +125,6 @@ export const resolveConfig = async function (opts): Promise<Config> {
 
     siteInfo = updatedSiteInfo.siteInfo
     accounts = updatedSiteInfo.accounts
-    addons = updatedSiteInfo.addons
     integrations = updatedSiteInfo.integrations
   }
 
@@ -162,7 +158,6 @@ export const resolveConfig = async function (opts): Promise<Config> {
     config,
     siteInfo,
     accounts,
-    addons,
     buildDir,
     branch,
     deployId,
@@ -184,7 +179,6 @@ export const resolveConfig = async function (opts): Promise<Config> {
     siteInfo,
     integrations: mergedIntegrations,
     accounts,
-    addons,
     env,
     configPath,
     redirectsPath,
diff --git a/packages/config/tests/api/snapshots/tests.js.md b/packages/config/tests/api/snapshots/tests.js.md
index 929e7dc6f1..ad7c5ef01f 100644
--- a/packages/config/tests/api/snapshots/tests.js.md
+++ b/packages/config/tests/api/snapshots/tests.js.md
@@ -10,7 +10,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/empty",␊
       "config": {␊
@@ -148,7 +147,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/empty",␊
       "config": {␊
@@ -289,7 +287,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/empty",␊
       "config": {␊
@@ -427,7 +424,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/empty",␊
       "config": {␊
@@ -571,7 +567,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/empty",␊
       "config": {␊
@@ -715,7 +710,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/empty",␊
       "config": {␊
@@ -890,7 +884,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/empty",␊
       "config": {␊
@@ -1034,7 +1027,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/empty",␊
       "config": {␊
@@ -1172,7 +1164,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/empty",␊
       "config": {␊
@@ -1317,7 +1308,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/empty",␊
       "config": {␊
@@ -1360,7 +1350,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/empty",␊
       "config": {␊
@@ -1528,7 +1517,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/base/base",␊
       "config": {␊
@@ -1728,7 +1716,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/build_settings/other_base",␊
       "config": {␊
@@ -1931,7 +1918,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/base",␊
       "config": {␊
@@ -2075,7 +2061,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/base",␊
       "config": {␊
@@ -2213,7 +2198,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/base",␊
       "config": {␊
@@ -2262,7 +2246,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/api/fixtures/build_base_override/subdir",␊
       "config": {␊
diff --git a/packages/config/tests/api/snapshots/tests.js.snap b/packages/config/tests/api/snapshots/tests.js.snap
index 4cf9ceda68..e2c7cefde1 100644
Binary files a/packages/config/tests/api/snapshots/tests.js.snap and b/packages/config/tests/api/snapshots/tests.js.snap differ
diff --git a/packages/config/tests/api/tests.js b/packages/config/tests/api/tests.js
index 1aafd8e9cd..ddcb6188ce 100644
--- a/packages/config/tests/api/tests.js
+++ b/packages/config/tests/api/tests.js
@@ -456,7 +456,7 @@ test('baseRelDir is true if build.base is overridden', async (t) => {
   t.snapshot(normalizeOutput(output))
 })
 
-test('It does not fetch site info if cachedConfig is provided, use_cached_site_info is true and there is siteInfo, accounts, addons and integrations on cachedConfig', async (t) => {
+test('It does not fetch site info if cachedConfig is provided, use_cached_site_info is true and there is siteInfo, accounts, and integrations on cachedConfig', async (t) => {
   const cachedConfig = await new Fixture('./fixtures/cached_config').runWithConfigAsObject()
   const { requests } = await new Fixture('./fixtures/cached_config')
     .withFlags({
@@ -474,7 +474,7 @@ test('It does not fetch site info if cachedConfig is provided, use_cached_site_i
   t.assert(requests.length === 0)
 })
 
-test('It fetches site info if cachedConfig is provided, use_cached_site_info is true and there is no siteInfo, accounts, addons or integrations on cachedConfig', async (t) => {
+test('It fetches site info if cachedConfig is provided, use_cached_site_info is true and there is no siteInfo, accounts, or integrations on cachedConfig', async (t) => {
   const cachedConfig = await new Fixture('./fixtures/cached_config').runWithConfigAsObject()
   const { requests } = await new Fixture('./fixtures/cached_config')
     .withFlags({
diff --git a/packages/config/tests/base/snapshots/tests.js.md b/packages/config/tests/base/snapshots/tests.js.md
index cd5e4570a2..450b2061cc 100644
--- a/packages/config/tests/base/snapshots/tests.js.md
+++ b/packages/config/tests/base/snapshots/tests.js.md
@@ -10,7 +10,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/base/fixtures/default_config/base",␊
       "config": {␊
@@ -149,7 +148,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/base/fixtures/prop_config/base",␊
       "config": {␊
@@ -292,7 +290,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/base/fixtures/recursive/base",␊
       "config": {␊
@@ -431,7 +428,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/base/fixtures/prop_config/base",␊
       "config": {␊
@@ -581,7 +577,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/base/fixtures/base_without_publish/base",␊
       "config": {␊
@@ -718,7 +713,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/base/fixtures/base_without_publish/base",␊
       "config": {␊
@@ -855,7 +849,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/base/fixtures/base_without_publish/base",␊
       "config": {␊
diff --git a/packages/config/tests/base/snapshots/tests.js.snap b/packages/config/tests/base/snapshots/tests.js.snap
index d24bee1c91..11828670cd 100644
Binary files a/packages/config/tests/base/snapshots/tests.js.snap and b/packages/config/tests/base/snapshots/tests.js.snap differ
diff --git a/packages/config/tests/cli/snapshots/tests.js.md b/packages/config/tests/cli/snapshots/tests.js.md
index 4e8ed0f0e3..11e898c78e 100644
--- a/packages/config/tests/cli/snapshots/tests.js.md
+++ b/packages/config/tests/cli/snapshots/tests.js.md
@@ -59,7 +59,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/cli/fixtures/empty",␊
       "config": {␊
@@ -206,7 +205,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "test",␊
       "buildDir": "packages/config/tests/cli/fixtures/empty",␊
       "config": {␊
@@ -346,7 +344,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/cli/fixtures/empty",␊
       "config": {␊
@@ -488,7 +485,6 @@ Generated by [AVA](https://avajs.dev).
       "siteInfo": {},␊
       "integrations": [],␊
       "accounts": [],␊
-      "addons": [],␊
       "env": {␊
         "DEPLOY_ID": {␊
           "sources": [␊
@@ -626,7 +622,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/cli/fixtures/empty",␊
       "config": {␊
@@ -766,7 +761,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/cli/fixtures/toml",␊
       "config": {␊
@@ -909,7 +903,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/cli/fixtures/toml",␊
       "config": {␊
@@ -1051,7 +1044,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/cli/fixtures/toml",␊
       "config": {␊
diff --git a/packages/config/tests/cli/snapshots/tests.js.snap b/packages/config/tests/cli/snapshots/tests.js.snap
index db27e8ec20..b3294ed4e7 100644
Binary files a/packages/config/tests/cli/snapshots/tests.js.snap and b/packages/config/tests/cli/snapshots/tests.js.snap differ
diff --git a/packages/config/tests/context/snapshots/tests.js.md b/packages/config/tests/context/snapshots/tests.js.md
index ad86b24c97..ab7f3fbdde 100644
--- a/packages/config/tests/context/snapshots/tests.js.md
+++ b/packages/config/tests/context/snapshots/tests.js.md
@@ -10,7 +10,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/context/fixtures/context_flag",␊
       "config": {␊
@@ -150,7 +149,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/context/fixtures/context_flag",␊
       "config": {␊
@@ -290,7 +288,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/context/fixtures/context_default",␊
       "config": {␊
@@ -430,7 +427,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "testBranch",␊
       "buildDir": "packages/config/tests/context/fixtures/branch",␊
       "config": {␊
@@ -570,7 +566,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "testBranch",␊
       "buildDir": "packages/config/tests/context/fixtures/branch",␊
       "config": {␊
@@ -710,7 +705,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "testBranch",␊
       "buildDir": "/tmp-dir",␊
       "config": {␊
@@ -844,7 +838,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "master",␊
       "buildDir": "/tmp-dir",␊
       "config": {␊
@@ -972,7 +965,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/context/fixtures/deep_merge",␊
       "config": {␊
@@ -1126,7 +1118,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/context/fixtures/array_merge",␊
       "config": {␊
@@ -1271,7 +1262,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "testBranch",␊
       "buildDir": "packages/config/tests/context/fixtures/priority_merge",␊
       "config": {␊
@@ -1413,7 +1403,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/context/fixtures/context_reset",␊
       "config": {␊
@@ -1557,7 +1546,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/context/fixtures/context_edge_functions_build",␊
       "config": {␊
@@ -1694,7 +1682,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/context/fixtures/context_edge_functions_top",␊
       "config": {␊
diff --git a/packages/config/tests/context/snapshots/tests.js.snap b/packages/config/tests/context/snapshots/tests.js.snap
index 6e337e2555..4bb313dd49 100644
Binary files a/packages/config/tests/context/snapshots/tests.js.snap and b/packages/config/tests/context/snapshots/tests.js.snap differ
diff --git a/packages/config/tests/cwd/snapshots/tests.js.md b/packages/config/tests/cwd/snapshots/tests.js.md
index 2dbfcd460b..d2b8750fbd 100644
--- a/packages/config/tests/cwd/snapshots/tests.js.md
+++ b/packages/config/tests/cwd/snapshots/tests.js.md
@@ -10,7 +10,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/cwd/fixtures/empty",␊
       "config": {␊
@@ -147,7 +146,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config",␊
       "config": {␊
@@ -284,7 +282,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/cwd/fixtures/build_base_cwd/base",␊
       "config": {␊
@@ -421,7 +418,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/cwd/fixtures/build_base_override/subdir",␊
       "config": {␊
@@ -558,7 +554,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/cwd/fixtures/empty",␊
       "config": {␊
@@ -694,7 +689,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/cwd/fixtures/empty",␊
       "config": {␊
@@ -834,7 +828,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "/tmp-dir",␊
       "config": {␊
@@ -982,7 +975,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/cwd/fixtures/build_base_package_json/subdir",␊
       "config": {␊
diff --git a/packages/config/tests/cwd/snapshots/tests.js.snap b/packages/config/tests/cwd/snapshots/tests.js.snap
index 639c41e2ba..9528b89443 100644
Binary files a/packages/config/tests/cwd/snapshots/tests.js.snap and b/packages/config/tests/cwd/snapshots/tests.js.snap differ
diff --git a/packages/config/tests/env/tests.js b/packages/config/tests/env/tests.js
index a8d6463132..9bb658b78f 100644
--- a/packages/config/tests/env/tests.js
+++ b/packages/config/tests/env/tests.js
@@ -4,7 +4,6 @@ import test from 'ava'
 // List of API endpoints to mock
 const SITE_INFO_PATH = '/api/v1/sites/test'
 const LIST_ACCOUNTS_PATH = '/api/v1/accounts'
-const LIST_ADDONS_PATH = '/api/v1/sites/test/service-instances'
 const TEAM_ENVELOPE_PATH = '/api/v1/accounts/team/env?context_name=production'
 const SITE_ENVELOPE_PATH = '/api/v1/accounts/team/env?context_name=production&site_id=test'
 
@@ -58,18 +57,6 @@ const LIST_ACCOUNTS_RESPONSE_WRONG_SHAPE = [
     response: {},
   },
 ]
-const LIST_ADDONS_RESPONSE_SUCCESS = {
-  path: LIST_ADDONS_PATH,
-  response: [{ env: { TEST: 'test' } }],
-}
-const LIST_ADDONS_RESPONSE_ERROR = {
-  path: LIST_ADDONS_PATH,
-  status: 500,
-}
-const LIST_ADDONS_RESPONSE_WRONG_SHAPE = {
-  path: LIST_ADDONS_PATH,
-  response: {},
-}
 const SITE_INFO_WITH_ENVELOPE = {
   path: SITE_INFO_PATH,
   response: {
@@ -521,57 +508,6 @@ test('Does not set accounts environment variables without a token', async (t) =>
   t.is(TEST, undefined)
 })
 
-test('Sets addons environment variables', async (t) => {
-  const {
-    env: { TEST },
-  } = await new Fixture('./fixtures/empty').withFlags(AUTH_FLAGS).runConfigServerAsObject(LIST_ADDONS_RESPONSE_SUCCESS)
-  t.deepEqual(TEST.sources, ['addons'])
-  t.is(TEST.value, 'test')
-})
-
-test('Does not set addons environment variables on API error', async (t) => {
-  const { output } = await new Fixture('./fixtures/empty')
-    .withFlags(AUTH_FLAGS)
-    .runConfigServer(LIST_ADDONS_RESPONSE_ERROR)
-  t.true(isDefinedString(output))
-})
-
-test('Does not set addons environment variables on API wrong response shape', async (t) => {
-  const {
-    env: { TEST },
-  } = await new Fixture('./fixtures/empty')
-    .withFlags(AUTH_FLAGS)
-    .runConfigServerAsObject(LIST_ADDONS_RESPONSE_WRONG_SHAPE)
-  t.is(TEST, undefined)
-})
-
-test('Does not set addons environment variables if offline', async (t) => {
-  const {
-    env: { TEST },
-  } = await new Fixture('./fixtures/empty')
-    .withFlags(AUTH_FLAGS_OFFLINE)
-    .runConfigServerAsObject(LIST_ADDONS_RESPONSE_SUCCESS)
-  t.is(TEST, undefined)
-})
-
-test('Does not set addons environment variables without a siteId', async (t) => {
-  const {
-    env: { TEST },
-  } = await new Fixture('./fixtures/empty')
-    .withFlags(AUTH_FLAGS_NO_SITE_ID)
-    .runConfigServerAsObject(LIST_ADDONS_RESPONSE_SUCCESS)
-  t.is(TEST, undefined)
-})
-
-test('Does not set addons environment variables without a token', async (t) => {
-  const {
-    env: { TEST },
-  } = await new Fixture('./fixtures/empty')
-    .withFlags(AUTH_FLAGS_NO_TOKEN)
-    .runConfigServerAsObject(LIST_ADDONS_RESPONSE_SUCCESS)
-  t.is(TEST, undefined)
-})
-
 test('Does not allow overridding readonly environment variables', async (t) => {
   const {
     env: { REVIEW_ID },
diff --git a/packages/config/tests/load/snapshots/tests.js.md b/packages/config/tests/load/snapshots/tests.js.md
index 8f4c620a59..c3228ffd57 100644
--- a/packages/config/tests/load/snapshots/tests.js.md
+++ b/packages/config/tests/load/snapshots/tests.js.md
@@ -10,7 +10,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/empty",␊
       "config": {␊
@@ -146,7 +145,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "/tmp-dir",␊
       "config": {␊
@@ -275,7 +273,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config",␊
       "config": {␊
@@ -412,7 +409,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config",␊
       "config": {␊
@@ -556,7 +552,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/default_merge",␊
       "config": {␊
@@ -698,7 +693,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/default_merge",␊
       "config": {␊
@@ -836,7 +830,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/default_priority",␊
       "config": {␊
@@ -974,7 +967,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/plugins_merge",␊
       "config": {␊
@@ -1125,7 +1117,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/empty",␊
       "config": {␊
@@ -1268,7 +1259,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/empty",␊
       "config": {␊
@@ -1410,7 +1400,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/default_merge",␊
       "config": {␊
@@ -1552,7 +1541,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/default_merge",␊
       "config": {␊
@@ -1690,7 +1678,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/default_priority",␊
       "config": {␊
@@ -1828,7 +1815,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/default_priority",␊
       "config": {␊
@@ -1966,7 +1952,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/merge_base/base",␊
       "config": {␊
@@ -2103,7 +2088,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/default_priority",␊
       "config": {␊
@@ -2249,7 +2233,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/default_priority",␊
       "config": {␊
@@ -2387,7 +2370,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/default_priority",␊
       "config": {␊
@@ -2525,7 +2507,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/default_priority",␊
       "config": {␊
@@ -2675,7 +2656,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/empty",␊
       "config": {␊
@@ -2814,7 +2794,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/cached_config",␊
       "config": {␊
@@ -2952,7 +2931,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/cached_config",␊
       "config": {␊
@@ -3090,7 +3068,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/cached_config",␊
       "config": {␊
@@ -3228,7 +3205,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/cached_config",␊
       "config": {␊
@@ -3368,7 +3344,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/cached_config",␊
       "config": {␊
@@ -3514,7 +3489,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/empty",␊
       "config": {␊
@@ -3650,7 +3624,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/empty",␊
       "config": {␊
@@ -3825,7 +3798,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/load/fixtures/empty",␊
       "config": {␊
diff --git a/packages/config/tests/load/snapshots/tests.js.snap b/packages/config/tests/load/snapshots/tests.js.snap
index 350a9bb7a4..7cab4cc9dd 100644
Binary files a/packages/config/tests/load/snapshots/tests.js.snap and b/packages/config/tests/load/snapshots/tests.js.snap differ
diff --git a/packages/config/tests/log/snapshots/tests.js.md b/packages/config/tests/log/snapshots/tests.js.md
index 1682185d0e..f30481c7a6 100644
--- a/packages/config/tests/log/snapshots/tests.js.md
+++ b/packages/config/tests/log/snapshots/tests.js.md
@@ -47,7 +47,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/log/fixtures/simple",␊
       "config": {␊
@@ -219,7 +218,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/log/fixtures/empty",␊
       "config": {␊
@@ -395,7 +393,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/log/fixtures/empty",␊
       "config": {␊
@@ -587,7 +584,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/log/fixtures/simple",␊
       "config": {␊
@@ -778,7 +774,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/log/fixtures/simple",␊
       "config": {␊
@@ -959,7 +954,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/log/fixtures/simple",␊
       "config": {␊
diff --git a/packages/config/tests/log/snapshots/tests.js.snap b/packages/config/tests/log/snapshots/tests.js.snap
index bd079e44a0..f058a0d9f8 100644
Binary files a/packages/config/tests/log/snapshots/tests.js.snap and b/packages/config/tests/log/snapshots/tests.js.snap differ
diff --git a/packages/config/tests/mutate/snapshots/tests.js.md b/packages/config/tests/mutate/snapshots/tests.js.md
index 757f4a7ec3..8ebb20d4fe 100644
--- a/packages/config/tests/mutate/snapshots/tests.js.md
+++ b/packages/config/tests/mutate/snapshots/tests.js.md
@@ -10,7 +10,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/mutate/fixtures/update",␊
       "config": {␊
@@ -148,7 +147,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/mutate/fixtures/context",␊
       "config": {␊
@@ -286,7 +284,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/mutate/fixtures/merge",␊
       "config": {␊
diff --git a/packages/config/tests/mutate/snapshots/tests.js.snap b/packages/config/tests/mutate/snapshots/tests.js.snap
index 78532cdc68..334636ec3c 100644
Binary files a/packages/config/tests/mutate/snapshots/tests.js.snap and b/packages/config/tests/mutate/snapshots/tests.js.snap differ
diff --git a/packages/config/tests/normalize/snapshots/tests.js.md b/packages/config/tests/normalize/snapshots/tests.js.md
index ad218a0142..a87148b694 100644
--- a/packages/config/tests/normalize/snapshots/tests.js.md
+++ b/packages/config/tests/normalize/snapshots/tests.js.md
@@ -10,7 +10,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/command_empty",␊
       "config": {␊
@@ -146,7 +145,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/props_case/base",␊
       "config": {␊
@@ -300,7 +298,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/props_case_default_config/base",␊
       "config": {␊
@@ -453,7 +450,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/empty",␊
       "config": {␊
@@ -588,7 +584,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/command_empty",␊
       "config": {␊
@@ -724,7 +719,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/command_origin_config",␊
       "config": {␊
@@ -862,7 +856,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/command_origin_context",␊
       "config": {␊
@@ -1000,7 +993,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/empty",␊
       "config": {␊
@@ -1137,7 +1129,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/default_functions_not_defined",␊
       "config": {␊
@@ -1275,7 +1266,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/legacy_default_functions_not_defined",␊
       "config": {␊
@@ -1413,7 +1403,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/default_functions_not_defined_directory_not_found",␊
       "config": {␊
@@ -1548,7 +1537,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/default_functions_defined",␊
       "config": {␊
@@ -1687,7 +1675,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/default_functions_defined_legacy",␊
       "config": {␊
@@ -1826,7 +1813,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/default_functions_star_priority_first",␊
       "config": {␊
@@ -1972,7 +1958,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/default_functions_star_priority_last",␊
       "config": {␊
@@ -2118,7 +2103,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/default_edge_functions_not_defined",␊
       "config": {␊
@@ -2254,7 +2238,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/default_edge_functions_defined",␊
       "config": {␊
@@ -2391,7 +2374,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/function_config_top_level",␊
       "config": {␊
@@ -2533,7 +2515,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/function_config_all_levels",␊
       "config": {␊
@@ -2689,7 +2670,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/function_config_ambiguous",␊
       "config": {␊
@@ -2830,7 +2810,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/function_config_included_files",␊
       "config": {␊
@@ -2982,7 +2961,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/merge_netlify_toml_default",␊
       "config": {␊
@@ -3142,7 +3120,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/merge_netlify_toml_context",␊
       "config": {␊
@@ -3302,7 +3279,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/normalize/fixtures/merge_netlify_toml_context_last",␊
       "config": {␊
diff --git a/packages/config/tests/normalize/snapshots/tests.js.snap b/packages/config/tests/normalize/snapshots/tests.js.snap
index 1ef00365ae..2db7a214f2 100644
Binary files a/packages/config/tests/normalize/snapshots/tests.js.snap and b/packages/config/tests/normalize/snapshots/tests.js.snap differ
diff --git a/packages/config/tests/parse/snapshots/tests.js.md b/packages/config/tests/parse/snapshots/tests.js.md
index 00fb36c61a..c8e9a33fbf 100644
--- a/packages/config/tests/parse/snapshots/tests.js.md
+++ b/packages/config/tests/parse/snapshots/tests.js.md
@@ -10,7 +10,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/toml",␊
       "config": {␊
@@ -169,7 +168,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/parse_backslash_valid",␊
       "config": {␊
@@ -332,7 +330,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/parse_backslash_trailing_double_multiline",␊
       "config": {␊
@@ -471,7 +468,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/parse_backslash_single",␊
       "config": {␊
@@ -608,7 +604,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/parse_backslash_single_multiline",␊
       "config": {␊
@@ -745,7 +740,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/parse_backslash_equal",␊
       "config": {␊
@@ -882,7 +876,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/redirects_file",␊
       "config": {␊
@@ -1027,7 +1020,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/redirects_field",␊
       "config": {␊
@@ -1173,7 +1165,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/redirects_both",␊
       "config": {␊
@@ -1346,7 +1337,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/redirects_file_error",␊
       "config": {␊
@@ -1502,7 +1492,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/redirects_field_error",␊
       "config": {␊
@@ -1648,7 +1637,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/redirects_no_publish",␊
       "config": {␊
@@ -1792,7 +1780,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/empty",␊
       "config": {␊
@@ -1963,7 +1950,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/empty",␊
       "config": {␊
@@ -2099,7 +2085,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/redirects_file",␊
       "config": {␊
@@ -2245,7 +2230,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/headers_file",␊
       "config": {␊
@@ -2388,7 +2372,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/headers_field",␊
       "config": {␊
@@ -2532,7 +2515,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/headers_both",␊
       "config": {␊
@@ -2701,7 +2683,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/headers_file_error",␊
       "config": {␊
@@ -2855,7 +2836,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/headers_field_error",␊
       "config": {␊
@@ -2999,7 +2979,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/headers_no_publish",␊
       "config": {␊
@@ -3141,7 +3120,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/empty",␊
       "config": {␊
@@ -3312,7 +3290,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/empty",␊
       "config": {␊
@@ -3448,7 +3425,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/headers_file",␊
       "config": {␊
@@ -3595,7 +3571,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/headers_duplicate_case_same",␊
       "config": {␊
@@ -3741,7 +3716,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/parse/fixtures/headers_duplicate_case_different",␊
       "config": {␊
diff --git a/packages/config/tests/parse/snapshots/tests.js.snap b/packages/config/tests/parse/snapshots/tests.js.snap
index c408259d3b..c3e4475498 100644
Binary files a/packages/config/tests/parse/snapshots/tests.js.snap and b/packages/config/tests/parse/snapshots/tests.js.snap differ
diff --git a/packages/config/tests/validate/snapshots/tests.js.md b/packages/config/tests/validate/snapshots/tests.js.md
index 84f821678e..f55241d6a6 100644
--- a/packages/config/tests/validate/snapshots/tests.js.md
+++ b/packages/config/tests/validate/snapshots/tests.js.md
@@ -291,7 +291,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/validate/fixtures/build_publish_parent_build/base",␊
       "config": {␊
@@ -669,7 +668,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/validate/fixtures/build_context_plugins_warn",␊
       "config": {␊
@@ -811,7 +809,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/validate/fixtures/build_context_plugins_nowarn_global",␊
       "config": {␊
@@ -953,7 +950,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/validate/fixtures/build_context_plugins_nowarn_none",␊
       "config": {␊
@@ -1113,7 +1109,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
     {␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/validate/fixtures/build_context_plugins_warn_inputs",␊
       "config": {␊
@@ -1658,7 +1653,6 @@ Generated by [AVA](https://avajs.dev).
 
     `{␊
       "accounts": [],␊
-      "addons": [],␊
       "branch": "branch",␊
       "buildDir": "packages/config/tests/validate/fixtures/edge_functions_mode_allowed",␊
       "config": {␊
diff --git a/packages/config/tests/validate/snapshots/tests.js.snap b/packages/config/tests/validate/snapshots/tests.js.snap
index 4b59ad0048..8757c33693 100644
Binary files a/packages/config/tests/validate/snapshots/tests.js.snap and b/packages/config/tests/validate/snapshots/tests.js.snap differ