diff --git a/packages/babel-plugin-remove-graphql-queries/package.json b/packages/babel-plugin-remove-graphql-queries/package.json
index 11218f6326f3c..e82447af7b52b 100644
--- a/packages/babel-plugin-remove-graphql-queries/package.json
+++ b/packages/babel-plugin-remove-graphql-queries/package.json
@@ -9,14 +9,14 @@
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/babel-plugin-remove-graphql-queries#readme",
   "dependencies": {
-    "@babel/runtime": "^7.15.4"
+    "@babel/runtime": "^7.15.4",
+    "gatsby-core-utils": "^2.14.0-next.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.15.4",
     "@babel/core": "^7.15.5",
     "babel-preset-gatsby-package": "^1.14.0-next.2",
-    "cross-env": "^7.0.3",
-    "gatsby-core-utils": "^2.14.0-next.2"
+    "cross-env": "^7.0.3"
   },
   "peerDependencies": {
     "@babel/core": "^7.0.0",
diff --git a/packages/gatsby-plugin-no-sourcemaps/package.json b/packages/gatsby-plugin-no-sourcemaps/package.json
index 1a9cd5ebf05de..973f738a9b8c7 100644
--- a/packages/gatsby-plugin-no-sourcemaps/package.json
+++ b/packages/gatsby-plugin-no-sourcemaps/package.json
@@ -20,13 +20,13 @@
     "url": "https://github.com/gatsbyjs/gatsby.git",
     "directory": "packages/gatsby-plugin-no-sourcemaps"
   },
+  "dependencies": {
+    "@babel/runtime": "^7.15.4"
+  },
   "peerDependencies": {
     "gatsby": "^3.0.0-next.0"
   },
   "engines": {
     "node": ">=12.13.0"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.15.4"
   }
 }
diff --git a/packages/gatsby-plugin-schema-snapshot/package.json b/packages/gatsby-plugin-schema-snapshot/package.json
index 5e6dc945b0003..c7d6c6fa8508f 100644
--- a/packages/gatsby-plugin-schema-snapshot/package.json
+++ b/packages/gatsby-plugin-schema-snapshot/package.json
@@ -16,10 +16,10 @@
     "directory": "packages/gatsby-plugin-schema-snapshot"
   },
   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-schema-snapshot#readme",
-  "peerDependencies": {
-    "gatsby": "^3.0.0-next.0"
-  },
   "dependencies": {
     "@babel/runtime": "^7.15.4"
+  },
+  "peerDependencies": {
+    "gatsby": "^3.0.0-next.0"
   }
 }
diff --git a/packages/gatsby-plugin-styletron/package.json b/packages/gatsby-plugin-styletron/package.json
index c9b9e309f4ebc..b0487638754fd 100644
--- a/packages/gatsby-plugin-styletron/package.json
+++ b/packages/gatsby-plugin-styletron/package.json
@@ -6,6 +6,9 @@
   "bugs": {
     "url": "https://github.com/gatsbyjs/gatsby/issues"
   },
+  "dependencies": {
+    "@babel/runtime": "^7.15.4"
+  },
   "devDependencies": {
     "@babel/cli": "^7.15.4",
     "@babel/core": "^7.15.5",
@@ -39,8 +42,5 @@
   },
   "engines": {
     "node": ">=12.13.0"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.15.4"
   }
 }
diff --git a/patches/v4/1-lmdb-default.patch b/patches/v4/1-lmdb-default.patch
index 68795249f00d3..1a7a82c1f976a 100644
--- a/patches/v4/1-lmdb-default.patch
+++ b/patches/v4/1-lmdb-default.patch
@@ -13,7 +13,7 @@ index f9b0648b15..bfbd311aca 100644
 @@ -180,7 +181,6 @@
      "cross-env": "^7.0.3",
      "documentation": "^13.1.0",
-     "enhanced-resolve": "^4.2.0",
+     "enhanced-resolve": "^5.8.2",
 -    "lmdb-store": "~1.5.5",
      "react": "^16.12.0",
      "react-dom": "^16.12.0",
diff --git a/patches/v4/2-gatsby-peerdeps.patch b/patches/v4/2-gatsby-peerdeps.patch
index 5be2f2117f52d..717a2fd808c45 100644
--- a/patches/v4/2-gatsby-peerdeps.patch
+++ b/patches/v4/2-gatsby-peerdeps.patch
@@ -133,7 +133,7 @@ index 0b7931da5d..dbaf39f0aa 100644
 --- a/packages/gatsby-plugin-flow/package.json
 +++ b/packages/gatsby-plugin-flow/package.json
 @@ -35,7 +35,7 @@
-     "gatsby-plugin-utils": "^1.14.0-next.0"
+     "gatsby-plugin-utils": "^1.14.0-next.2"
    },
    "peerDependencies": {
 -    "gatsby": "^3.0.0-next.0"
@@ -158,15 +158,15 @@ diff --git a/packages/gatsby-plugin-gatsby-cloud/package.json b/packages/gatsby-
 index 4c60d3b69c..13aa3fad31 100644
 --- a/packages/gatsby-plugin-gatsby-cloud/package.json
 +++ b/packages/gatsby-plugin-gatsby-cloud/package.json
-@@ -41,7 +41,7 @@
+@@ -42,7 +42,7 @@
    "license": "MIT",
    "main": "index.js",
    "peerDependencies": {
--    "gatsby": "^3.0.0-next.0"
-+    "gatsby": "^4.0.0-alpha-9689ff"
+-    "gatsby": "^3.0.0-next.0",
++    "gatsby": "^4.0.0-alpha-9689ff",
+     "webpack": "*"
    },
    "repository": {
-     "type": "git",
 diff --git a/packages/gatsby-plugin-google-analytics/package.json b/packages/gatsby-plugin-google-analytics/package.json
 index a23803d486..41fa1fa4bd 100644
 --- a/packages/gatsby-plugin-google-analytics/package.json
@@ -328,7 +328,7 @@ index af70e129a7..89b2e83272 100644
 --- a/packages/gatsby-plugin-no-sourcemaps/package.json
 +++ b/packages/gatsby-plugin-no-sourcemaps/package.json
 @@ -21,7 +21,7 @@
-     "directory": "packages/gatsby-plugin-no-sourcemaps"
+     "@babel/runtime": "^7.15.4"
    },
    "peerDependencies": {
 -    "gatsby": "^3.0.0-next.0"
@@ -471,8 +471,8 @@ index ca7081c0c8..7c9c638a2f 100644
 --- a/packages/gatsby-plugin-schema-snapshot/package.json
 +++ b/packages/gatsby-plugin-schema-snapshot/package.json
 @@ -17,6 +17,6 @@
+     "@babel/runtime": "^7.15.4"
    },
-   "homepage": "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-plugin-schema-snapshot#readme",
    "peerDependencies": {
 -    "gatsby": "^3.0.0-next.0"
 +    "gatsby": "^4.0.0-alpha-9689ff"
diff --git a/patches/v4/3-gatsby-plugin-mdx-subplugin.patch b/patches/v4/4-gatsby-plugin-mdx-subplugin.patch
similarity index 100%
rename from patches/v4/3-gatsby-plugin-mdx-subplugin.patch
rename to patches/v4/4-gatsby-plugin-mdx-subplugin.patch