diff --git a/packages/gatsby-link/src/index.js b/packages/gatsby-link/src/index.js
index 35de739d1b0b1..47f6fc2e77767 100644
--- a/packages/gatsby-link/src/index.js
+++ b/packages/gatsby-link/src/index.js
@@ -1,6 +1,6 @@
 import PropTypes from "prop-types"
 import React from "react"
-import { Link, Location } from "@reach/router"
+import { Link, Location } from "@gatsbyjs/reach-router"
 import { resolve } from "@gatsbyjs/reach-router/lib/utils"
 
 import { parsePath } from "./parse-path"
diff --git a/packages/gatsby-react-router-scroll/src/scroll-handler.tsx b/packages/gatsby-react-router-scroll/src/scroll-handler.tsx
index b547308b84810..11a0973499154 100644
--- a/packages/gatsby-react-router-scroll/src/scroll-handler.tsx
+++ b/packages/gatsby-react-router-scroll/src/scroll-handler.tsx
@@ -1,5 +1,5 @@
 import * as React from "react"
-import { LocationContext } from "@reach/router"
+import { LocationContext } from "@gatsbyjs/reach-router"
 import PropTypes from "prop-types"
 import { SessionStorage } from "./session-storage"
 
diff --git a/packages/gatsby-react-router-scroll/src/use-scroll-restoration.ts b/packages/gatsby-react-router-scroll/src/use-scroll-restoration.ts
index 58b40686e55b2..6fcd25ad7ec62 100644
--- a/packages/gatsby-react-router-scroll/src/use-scroll-restoration.ts
+++ b/packages/gatsby-react-router-scroll/src/use-scroll-restoration.ts
@@ -1,6 +1,6 @@
 import { ScrollContext } from "./scroll-handler"
 import { useRef, useContext, useLayoutEffect, MutableRefObject } from "react"
-import { useLocation } from "@reach/router"
+import { useLocation } from "@gatsbyjs/reach-router"
 
 interface IScrollRestorationProps {
   ref: MutableRefObject<HTMLElement | undefined>
diff --git a/packages/gatsby/cache-dir/navigation.js b/packages/gatsby/cache-dir/navigation.js
index 62e1832f2477a..98b17cbf49588 100644
--- a/packages/gatsby/cache-dir/navigation.js
+++ b/packages/gatsby/cache-dir/navigation.js
@@ -5,8 +5,8 @@ import redirects from "./redirects.json"
 import { apiRunner } from "./api-runner-browser"
 import emitter from "./emitter"
 import { RouteAnnouncerProps } from "./route-announcer-props"
-import { navigate as reachNavigate } from "@reach/router"
-import { globalHistory } from "@reach/router/lib/history"
+import { navigate as reachNavigate } from "@gatsbyjs/reach-router"
+import { globalHistory } from "@gatsbyjs/reach-router/lib/history"
 import { parsePath } from "gatsby-link"
 
 // Convert to a map for faster lookup in maybeRedirect()
diff --git a/packages/gatsby/cache-dir/production-app.js b/packages/gatsby/cache-dir/production-app.js
index 4e870917528f8..317e5932beff2 100644
--- a/packages/gatsby/cache-dir/production-app.js
+++ b/packages/gatsby/cache-dir/production-app.js
@@ -1,7 +1,7 @@
 import { apiRunner, apiRunnerAsync } from "./api-runner-browser"
 import React from "react"
 import ReactDOM from "react-dom"
-import { Router, navigate, Location, BaseContext } from "@reach/router"
+import { Router, navigate, Location, BaseContext } from "@gatsbyjs/reach-router"
 import { ScrollContext } from "gatsby-react-router-scroll"
 import domReady from "@mikaelkristiansson/domready"
 import { StaticQueryContext } from "gatsby"
diff --git a/packages/gatsby/cache-dir/root.js b/packages/gatsby/cache-dir/root.js
index 09220ca79fcf7..fc0b1625c3595 100644
--- a/packages/gatsby/cache-dir/root.js
+++ b/packages/gatsby/cache-dir/root.js
@@ -1,5 +1,5 @@
 import React from "react"
-import { Router, Location, BaseContext } from "@reach/router"
+import { Router, Location, BaseContext } from "@gatsbyjs/reach-router"
 import { ScrollContext } from "gatsby-react-router-scroll"
 
 import { shouldUpdateScroll, RouteUpdates } from "./navigation"
diff --git a/packages/gatsby/cache-dir/static-entry.js b/packages/gatsby/cache-dir/static-entry.js
index 6ac6ebdf748a4..f78a455f13916 100644
--- a/packages/gatsby/cache-dir/static-entry.js
+++ b/packages/gatsby/cache-dir/static-entry.js
@@ -1,7 +1,7 @@
 const React = require(`react`)
 const path = require(`path`)
 const { renderToString, renderToStaticMarkup } = require(`react-dom/server`)
-const { ServerLocation, Router, isRedirect } = require(`@reach/router`)
+const { ServerLocation, Router, isRedirect } = require(`@gatsbyjs/reach-router`)
 const { merge, flattenDeep, replace } = require(`lodash`)
 const { StaticQueryContext } = require(`gatsby`)
 const fs = require(`fs`)