diff --git a/app/layouts/OrgLayout.tsx b/app/layouts/OrgLayout.tsx
index c66b0fc2e1..011ad7158c 100644
--- a/app/layouts/OrgLayout.tsx
+++ b/app/layouts/OrgLayout.tsx
@@ -18,8 +18,9 @@ import {
   PageContainer,
 } from './helpers'
 
-// absolute paths are a workaround for
-// https://github.com/remix-run/react-router/pull/8985 not being released yet
+// We need to use absolute paths here because sometimes this layout is rendered
+// at `/orgs/:orgName` and other times it's rendered at `/orgs/:orgName/access`.
+// Relative paths would resolve differently in the two locations.
 
 const OrgLayout = () => {
   const { orgName } = useParams('orgName')
diff --git a/app/pages/project/disks/DisksPage.tsx b/app/pages/project/disks/DisksPage.tsx
index e7cd27d5fc..6f2c21ec90 100644
--- a/app/pages/project/disks/DisksPage.tsx
+++ b/app/pages/project/disks/DisksPage.tsx
@@ -32,7 +32,7 @@ function AttachedInstance(props: {
   })
   const instance = instances?.items.find((i) => i.id === props.instanceId)
   return instance ? (
-    <Link className="text-accent" to={`../../instances/${instance.name}`}>
+    <Link className="text-accent" to={`../instances/${instance.name}`}>
       {instance.name}
     </Link>
   ) : null
diff --git a/package.json b/package.json
index c251c8e9a1..11da2bce0f 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "react-is": "^17.0.2",
     "react-popper": "^2.2.5",
     "react-query": "^4.0.0-alpha.20",
-    "react-router-dom": "^6.4.0-pre.2",
+    "react-router-dom": "^6.4.0-pre.8",
     "react-transition-group": "^4.4.1",
     "recharts": "^2.1.6",
     "tiny-invariant": "^1.2.0",
diff --git a/yarn.lock b/yarn.lock
index 0cf8245602..14f5470c2f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2199,10 +2199,10 @@
     prop-types "^15.7.2"
     tslib "^2.3.0"
 
-"@remix-run/router@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-0.1.0.tgz#9dee1610f5ba730e4c67e5de517912f71c627031"
-  integrity sha512-mK2wZWAFsijTGIk7ZhKvEAzU7qIS6F6RhPy5AiEosaEs3mB3J2NvUWRoN3W74V+5Jju/AisT5NaM2pIbnfGXWg==
+"@remix-run/router@0.2.0-pre.3":
+  version "0.2.0-pre.3"
+  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-0.2.0-pre.3.tgz#2864cf275433ec39d2370a1aec28a5957060f47a"
+  integrity sha512-/1vRiMh8j31PBgLgB2lqcwDDEBEwsnucOouZ8GvJTRNHULkPOU3kvQ1ZUpt9IPd1lS5AVC93I9pVLnFhlNA4Mw==
 
 "@rollup/pluginutils@^4.1.2":
   version "4.1.2"
@@ -12027,12 +12027,12 @@ react-router-dom@^6.0.0:
     history "^5.2.0"
     react-router "6.2.1"
 
-react-router-dom@^6.4.0-pre.2:
-  version "6.4.0-pre.2"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.4.0-pre.2.tgz#6c34e3a96db3712a79dd78416b01dbb40f18aae7"
-  integrity sha512-Y6tOV4zs7uS+7pTbMoOcMWP9H5hVKINIyLIO1oWVVQEKv2KDEQx0njyPnhso4LkbOK6l7JhUMNO5DLwMqZVWFQ==
+react-router-dom@^6.4.0-pre.8:
+  version "6.4.0-pre.8"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.4.0-pre.8.tgz#1f784fa09719801250070431703dd02c5fdcde6e"
+  integrity sha512-5hxQdiPOG98YOANbJ8IBUKbRgU6k4/TSX4VyO6jRWoG6KY0K2EG5wjEZgZ0tlAN9fXFgnHsro/HKi/r+HxugAg==
   dependencies:
-    react-router "6.4.0-pre.2"
+    react-router "6.4.0-pre.8"
 
 react-router@6.2.1, react-router@^6.0.0:
   version "6.2.1"
@@ -12041,13 +12041,12 @@ react-router@6.2.1, react-router@^6.0.0:
   dependencies:
     history "^5.2.0"
 
-react-router@6.4.0-pre.2:
-  version "6.4.0-pre.2"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.4.0-pre.2.tgz#f80856faae0a1163ca58aad6ddf82e00a03264a3"
-  integrity sha512-JFwatrS+QFmyoOrjUNpHFeAO72Y1FUZ9wOfQoCm1a6cRglAbLXAdKll/WEGUtGUb3LwLx3uAZ57kPXHQX5vutw==
+react-router@6.4.0-pre.8:
+  version "6.4.0-pre.8"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.4.0-pre.8.tgz#90ce4cc590b453fc26ad2d131f51d908783c9091"
+  integrity sha512-xwt2s9jW5NaakymlSRG0hZoGda6E/Skfgmj/4vlwvRX/kqoO8jU0g+Vi3sHDCatH/V+GjDyTQkdMEDm8qGsBsQ==
   dependencies:
-    "@remix-run/router" "^0.1.0"
-    use-sync-external-store "1.1.0"
+    "@remix-run/router" "0.2.0-pre.3"
 
 react-sizeme@^3.0.1:
   version "3.0.2"
@@ -14245,11 +14244,6 @@ use-sidecar@^1.0.1, use-sidecar@^1.0.5:
     detect-node-es "^1.1.0"
     tslib "^1.9.3"
 
-use-sync-external-store@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.1.0.tgz#3343c3fe7f7e404db70f8c687adf5c1652d34e82"
-  integrity sha512-SEnieB2FPKEVne66NpXPd1Np4R1lTNKfjuy3XdIoPQKYBAFdzbzSZlSn1KJZUiihQLQC5Znot4SBz1EOTBwQAQ==
-
 use@^3.1.0:
   version "3.1.1"
   resolved "https://registry.npmjs.org/use/-/use-3.1.1.tgz"