diff --git a/package.json b/package.json
index f92fe3fcf..492fa566a 100644
--- a/package.json
+++ b/package.json
@@ -245,7 +245,6 @@
     "@babel/runtime": "^7.26.0",
     "@crowdin/cli": "^4.14.1",
     "@eslint/js": "^9.39.2",
-    "@expo/config-plugins": "~54.0.4",
     "@lingui/babel-plugin-lingui-macro": "^5.9.2",
     "@lingui/cli": "^5.9.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
diff --git a/plugins/notificationsExtension/withAppEntitlements.js b/plugins/notificationsExtension/withAppEntitlements.js
index 4ce81ea61..d7dad9994 100644
--- a/plugins/notificationsExtension/withAppEntitlements.js
+++ b/plugins/notificationsExtension/withAppEntitlements.js
@@ -1,7 +1,6 @@
-const {withEntitlementsPlist} = require('@expo/config-plugins')
+const {withEntitlementsPlist} = require('expo/config-plugins')
 
 const withAppEntitlements = config => {
-  // eslint-disable-next-line no-shadow
   return withEntitlementsPlist(config, async config => {
     config.modResults['com.apple.security.application-groups'] = [
       `group.app.bsky`,
diff --git a/plugins/notificationsExtension/withExtensionEntitlements.js b/plugins/notificationsExtension/withExtensionEntitlements.js
index 0cc1c4ca8..29614ab09 100644
--- a/plugins/notificationsExtension/withExtensionEntitlements.js
+++ b/plugins/notificationsExtension/withExtensionEntitlements.js
@@ -1,10 +1,9 @@
-const {withInfoPlist} = require('@expo/config-plugins')
+const {withInfoPlist} = require('expo/config-plugins')
 const plist = require('@expo/plist')
 const path = require('path')
 const fs = require('fs')
 
 const withExtensionEntitlements = (config, {extensionName}) => {
-  // eslint-disable-next-line no-shadow
   return withInfoPlist(config, config => {
     const extensionEntitlementsPath = path.join(
       config.modRequest.platformProjectRoot,
diff --git a/plugins/notificationsExtension/withExtensionInfoPlist.js b/plugins/notificationsExtension/withExtensionInfoPlist.js
index b0c6cfa89..8de8c9910 100644
--- a/plugins/notificationsExtension/withExtensionInfoPlist.js
+++ b/plugins/notificationsExtension/withExtensionInfoPlist.js
@@ -1,10 +1,9 @@
-const {withInfoPlist} = require('@expo/config-plugins')
+const {withInfoPlist} = require('expo/config-plugins')
 const plist = require('@expo/plist')
 const path = require('path')
 const fs = require('fs')
 
 const withExtensionInfoPlist = (config, {extensionName}) => {
-  // eslint-disable-next-line no-shadow
   return withInfoPlist(config, config => {
     const plistPath = path.join(
       config.modRequest.projectRoot,
diff --git a/plugins/notificationsExtension/withExtensionViewController.js b/plugins/notificationsExtension/withExtensionViewController.js
index cd29bea7d..07aedcf34 100644
--- a/plugins/notificationsExtension/withExtensionViewController.js
+++ b/plugins/notificationsExtension/withExtensionViewController.js
@@ -1,4 +1,4 @@
-const {withXcodeProject} = require('@expo/config-plugins')
+const {withXcodeProject} = require('expo/config-plugins')
 const path = require('path')
 const fs = require('fs')
 
@@ -6,7 +6,6 @@ const withExtensionViewController = (
   config,
   {controllerName, extensionName},
 ) => {
-  // eslint-disable-next-line no-shadow
   return withXcodeProject(config, config => {
     const controllerPath = path.join(
       config.modRequest.projectRoot,
diff --git a/plugins/notificationsExtension/withNotificationsExtension.js b/plugins/notificationsExtension/withNotificationsExtension.js
index 6a00cfd23..a6b4fa8e5 100644
--- a/plugins/notificationsExtension/withNotificationsExtension.js
+++ b/plugins/notificationsExtension/withNotificationsExtension.js
@@ -1,4 +1,4 @@
-const {withPlugins} = require('@expo/config-plugins')
+const {withPlugins} = require('expo/config-plugins')
 const {withAppEntitlements} = require('./withAppEntitlements')
 const {withXcodeTarget} = require('./withXcodeTarget')
 const {withExtensionEntitlements} = require('./withExtensionEntitlements')
diff --git a/plugins/notificationsExtension/withSounds.js b/plugins/notificationsExtension/withSounds.js
index 652afd545..a626c13e8 100644
--- a/plugins/notificationsExtension/withSounds.js
+++ b/plugins/notificationsExtension/withSounds.js
@@ -1,9 +1,8 @@
-const {withXcodeProject} = require('@expo/config-plugins')
+const {withXcodeProject} = require('expo/config-plugins')
 const path = require('path')
 const fs = require('fs')
 
 const withSounds = (config, {extensionName, soundFiles}) => {
-  // eslint-disable-next-line no-shadow
   return withXcodeProject(config, config => {
     for (const file of soundFiles) {
       const soundPath = path.join(config.modRequest.projectRoot, 'assets', file)
diff --git a/plugins/notificationsExtension/withXcodeTarget.js b/plugins/notificationsExtension/withXcodeTarget.js
index e9c7dae39..3307875c6 100644
--- a/plugins/notificationsExtension/withXcodeTarget.js
+++ b/plugins/notificationsExtension/withXcodeTarget.js
@@ -1,12 +1,9 @@
-const {withXcodeProject, IOSConfig} = require('@expo/config-plugins')
-const path = require('path')
-const PBXFile = require('xcode/lib/pbxFile')
+const {withXcodeProject} = require('expo/config-plugins')
 
 const withXcodeTarget = (
   config,
   {extensionName, controllerName, soundFiles},
 ) => {
-  // eslint-disable-next-line no-shadow
   return withXcodeProject(config, config => {
     let pbxProject = config.modResults
 
diff --git a/plugins/shareExtension/withAppEntitlements.js b/plugins/shareExtension/withAppEntitlements.js
index 4ce81ea61..d7dad9994 100644
--- a/plugins/shareExtension/withAppEntitlements.js
+++ b/plugins/shareExtension/withAppEntitlements.js
@@ -1,7 +1,6 @@
-const {withEntitlementsPlist} = require('@expo/config-plugins')
+const {withEntitlementsPlist} = require('expo/config-plugins')
 
 const withAppEntitlements = config => {
-  // eslint-disable-next-line no-shadow
   return withEntitlementsPlist(config, async config => {
     config.modResults['com.apple.security.application-groups'] = [
       `group.app.bsky`,
diff --git a/plugins/shareExtension/withExtensionEntitlements.js b/plugins/shareExtension/withExtensionEntitlements.js
index 7bee79d1a..9123d2296 100644
--- a/plugins/shareExtension/withExtensionEntitlements.js
+++ b/plugins/shareExtension/withExtensionEntitlements.js
@@ -1,10 +1,9 @@
-const {withInfoPlist} = require('@expo/config-plugins')
+const {withInfoPlist} = require('expo/config-plugins')
 const plist = require('@expo/plist')
 const path = require('path')
 const fs = require('fs')
 
 const withExtensionEntitlements = (config, {extensionName}) => {
-  // eslint-disable-next-line no-shadow
   return withInfoPlist(config, config => {
     const extensionEntitlementsPath = path.join(
       config.modRequest.platformProjectRoot,
diff --git a/plugins/shareExtension/withExtensionInfoPlist.js b/plugins/shareExtension/withExtensionInfoPlist.js
index 9afc4d5f9..4e1c299b3 100644
--- a/plugins/shareExtension/withExtensionInfoPlist.js
+++ b/plugins/shareExtension/withExtensionInfoPlist.js
@@ -1,10 +1,9 @@
-const {withInfoPlist} = require('@expo/config-plugins')
+const {withInfoPlist} = require('expo/config-plugins')
 const plist = require('@expo/plist')
 const path = require('path')
 const fs = require('fs')
 
 const withExtensionInfoPlist = (config, {extensionName}) => {
-  // eslint-disable-next-line no-shadow
   return withInfoPlist(config, config => {
     const plistPath = path.join(
       config.modRequest.projectRoot,
diff --git a/plugins/shareExtension/withExtensionViewController.js b/plugins/shareExtension/withExtensionViewController.js
index cd29bea7d..07aedcf34 100644
--- a/plugins/shareExtension/withExtensionViewController.js
+++ b/plugins/shareExtension/withExtensionViewController.js
@@ -1,4 +1,4 @@
-const {withXcodeProject} = require('@expo/config-plugins')
+const {withXcodeProject} = require('expo/config-plugins')
 const path = require('path')
 const fs = require('fs')
 
@@ -6,7 +6,6 @@ const withExtensionViewController = (
   config,
   {controllerName, extensionName},
 ) => {
-  // eslint-disable-next-line no-shadow
   return withXcodeProject(config, config => {
     const controllerPath = path.join(
       config.modRequest.projectRoot,
diff --git a/plugins/shareExtension/withIntentFilters.js b/plugins/shareExtension/withIntentFilters.js
index 16494893b..9eda8ce84 100644
--- a/plugins/shareExtension/withIntentFilters.js
+++ b/plugins/shareExtension/withIntentFilters.js
@@ -1,7 +1,6 @@
-const {withAndroidManifest} = require('@expo/config-plugins')
+const {withAndroidManifest} = require('expo/config-plugins')
 
 const withIntentFilters = config => {
-  // eslint-disable-next-line no-shadow
   return withAndroidManifest(config, config => {
     const intents = [
       {
diff --git a/plugins/shareExtension/withShareExtensions.js b/plugins/shareExtension/withShareExtensions.js
index 55a26c75e..1662f587f 100644
--- a/plugins/shareExtension/withShareExtensions.js
+++ b/plugins/shareExtension/withShareExtensions.js
@@ -1,4 +1,4 @@
-const {withPlugins} = require('@expo/config-plugins')
+const {withPlugins} = require('expo/config-plugins')
 const {withAppEntitlements} = require('./withAppEntitlements')
 const {withXcodeTarget} = require('./withXcodeTarget')
 const {withExtensionEntitlements} = require('./withExtensionEntitlements')
diff --git a/plugins/shareExtension/withXcodeTarget.js b/plugins/shareExtension/withXcodeTarget.js
index ce70b392d..5a1156686 100644
--- a/plugins/shareExtension/withXcodeTarget.js
+++ b/plugins/shareExtension/withXcodeTarget.js
@@ -1,7 +1,6 @@
-const {withXcodeProject} = require('@expo/config-plugins')
+const {withXcodeProject} = require('expo/config-plugins')
 
 const withXcodeTarget = (config, {extensionName, controllerName}) => {
-  // eslint-disable-next-line no-shadow
   return withXcodeProject(config, config => {
     const pbxProject = config.modResults
 
diff --git a/plugins/starterPackAppClipExtension/withAppEntitlements.js b/plugins/starterPackAppClipExtension/withAppEntitlements.js
index 1bffd8208..c0361ab8d 100644
--- a/plugins/starterPackAppClipExtension/withAppEntitlements.js
+++ b/plugins/starterPackAppClipExtension/withAppEntitlements.js
@@ -1,7 +1,6 @@
-const {withEntitlementsPlist} = require('@expo/config-plugins')
+const {withEntitlementsPlist} = require('expo/config-plugins')
 
 const withAppEntitlements = config => {
-  // eslint-disable-next-line no-shadow
   return withEntitlementsPlist(config, async config => {
     config.modResults['com.apple.security.application-groups'] = [
       `group.app.bsky`,
diff --git a/plugins/starterPackAppClipExtension/withClipEntitlements.js b/plugins/starterPackAppClipExtension/withClipEntitlements.js
index 77636b5c9..3ba1d944c 100644
--- a/plugins/starterPackAppClipExtension/withClipEntitlements.js
+++ b/plugins/starterPackAppClipExtension/withClipEntitlements.js
@@ -1,10 +1,9 @@
-const {withInfoPlist} = require('@expo/config-plugins')
+const {withInfoPlist} = require('expo/config-plugins')
 const plist = require('@expo/plist')
 const path = require('path')
 const fs = require('fs')
 
 const withClipEntitlements = (config, {targetName}) => {
-  // eslint-disable-next-line no-shadow
   return withInfoPlist(config, config => {
     const entitlementsPath = path.join(
       config.modRequest.platformProjectRoot,
diff --git a/plugins/starterPackAppClipExtension/withClipInfoPlist.js b/plugins/starterPackAppClipExtension/withClipInfoPlist.js
index 4f104a654..e5034cef3 100644
--- a/plugins/starterPackAppClipExtension/withClipInfoPlist.js
+++ b/plugins/starterPackAppClipExtension/withClipInfoPlist.js
@@ -1,10 +1,9 @@
-const {withInfoPlist} = require('@expo/config-plugins')
+const {withInfoPlist} = require('expo/config-plugins')
 const plist = require('@expo/plist')
 const path = require('path')
 const fs = require('fs')
 
 const withClipInfoPlist = (config, {targetName}) => {
-  // eslint-disable-next-line no-shadow
   return withInfoPlist(config, config => {
     const targetPath = path.join(
       config.modRequest.platformProjectRoot,
diff --git a/plugins/starterPackAppClipExtension/withFiles.js b/plugins/starterPackAppClipExtension/withFiles.js
index ad99f5ae4..c010a52f7 100644
--- a/plugins/starterPackAppClipExtension/withFiles.js
+++ b/plugins/starterPackAppClipExtension/withFiles.js
@@ -1,11 +1,10 @@
-const {withXcodeProject} = require('@expo/config-plugins')
+const {withXcodeProject} = require('expo/config-plugins')
 const path = require('path')
 const fs = require('fs')
 
 const FILES = ['AppDelegate.swift', 'ViewController.swift']
 
 const withFiles = (config, {targetName}) => {
-  // eslint-disable-next-line no-shadow
   return withXcodeProject(config, config => {
     const basePath = path.join(
       config.modRequest.projectRoot,
diff --git a/plugins/starterPackAppClipExtension/withStarterPackAppClip.js b/plugins/starterPackAppClipExtension/withStarterPackAppClip.js
index 1e3f0b702..a194ca34b 100644
--- a/plugins/starterPackAppClipExtension/withStarterPackAppClip.js
+++ b/plugins/starterPackAppClipExtension/withStarterPackAppClip.js
@@ -1,4 +1,4 @@
-const {withPlugins} = require('@expo/config-plugins')
+const {withPlugins} = require('expo/config-plugins')
 const {withAppEntitlements} = require('./withAppEntitlements')
 const {withClipEntitlements} = require('./withClipEntitlements')
 const {withClipInfoPlist} = require('./withClipInfoPlist')
diff --git a/plugins/starterPackAppClipExtension/withXcodeTarget.js b/plugins/starterPackAppClipExtension/withXcodeTarget.js
index c14d27291..0f96fa33f 100644
--- a/plugins/starterPackAppClipExtension/withXcodeTarget.js
+++ b/plugins/starterPackAppClipExtension/withXcodeTarget.js
@@ -1,9 +1,8 @@
-const {withXcodeProject} = require('@expo/config-plugins')
+const {withXcodeProject} = require('expo/config-plugins')
 
 const BUILD_PHASE_FILES = ['AppDelegate.swift', 'ViewController.swift']
 
 const withXcodeTarget = (config, {targetName}) => {
-  // eslint-disable-next-line no-shadow
   return withXcodeProject(config, config => {
     const pbxProject = config.modResults
 
diff --git a/plugins/withAndroidManifestIntentQueriesPlugin.js b/plugins/withAndroidManifestIntentQueriesPlugin.js
index 04237b059..4c53a8a01 100644
--- a/plugins/withAndroidManifestIntentQueriesPlugin.js
+++ b/plugins/withAndroidManifestIntentQueriesPlugin.js
@@ -1,7 +1,6 @@
-const {withAndroidManifest} = require('@expo/config-plugins')
+const {withAndroidManifest} = require('expo/config-plugins')
 
 const withProcessTextQuery = config =>
-  // eslint-disable-next-line no-shadow
   withAndroidManifest(config, config => {
     const manifest = config.modResults.manifest
 
diff --git a/plugins/withAndroidNoJitpackPlugin.js b/plugins/withAndroidNoJitpackPlugin.js
index 959eb1028..94755897d 100644
--- a/plugins/withAndroidNoJitpackPlugin.js
+++ b/plugins/withAndroidNoJitpackPlugin.js
@@ -1,4 +1,4 @@
-const {withProjectBuildGradle} = require('@expo/config-plugins')
+const {withProjectBuildGradle} = require('expo/config-plugins')
 
 const jitpackRepository = "maven { url 'https://www.jitpack.io' }"
 
diff --git a/plugins/withAndroidStylesAccentColorPlugin.js b/plugins/withAndroidStylesAccentColorPlugin.js
index 51dd44f35..3f97fac29 100644
--- a/plugins/withAndroidStylesAccentColorPlugin.js
+++ b/plugins/withAndroidStylesAccentColorPlugin.js
@@ -3,7 +3,7 @@
  * This way we get a sane default color for spinners, text inputs, etc.
  */
 
-const {withAndroidStyles, AndroidConfig} = require('@expo/config-plugins')
+const {withAndroidStyles, AndroidConfig} = require('expo/config-plugins')
 
 module.exports = function withAndroidStylesAccentColorPlugin(appConfig) {
   return withAndroidStyles(appConfig, function (decoratedAppConfig) {
diff --git a/plugins/withAppDelegateReferrer.js b/plugins/withAppDelegateReferrer.js
index 69feec57d..ca14875e1 100644
--- a/plugins/withAppDelegateReferrer.js
+++ b/plugins/withAppDelegateReferrer.js
@@ -1,11 +1,10 @@
-const {withAppDelegate} = require('@expo/config-plugins')
-const {mergeContents} = require('@expo/config-plugins/build/utils/generateCode')
+const {withAppDelegate, CodeGenerator} = require('expo/config-plugins')
 
 module.exports = config =>
   withAppDelegate(config, config => {
     let contents = config.modResults.contents
 
-    contents = mergeContents({
+    contents = CodeGenerator.mergeContents({
       src: contents,
       anchor: '// Linking API',
       newSrc: `
@@ -22,7 +21,7 @@ module.exports = config =>
       comment: '//',
     }).contents
 
-    contents = mergeContents({
+    contents = CodeGenerator.mergeContents({
       src: contents,
       anchor: '// Universal Links',
       newSrc: `