diff --git a/next-sitemap.config.js b/next-sitemap.config.js
index 315a868..242d8db 100644
--- a/next-sitemap.config.js
+++ b/next-sitemap.config.js
@@ -1,6 +1,6 @@
 /** @type {import('next-sitemap').IConfig} */
 module.exports = {
-  siteUrl: `https://authzed.com${process.env.BASE_DIR ?? ''}`,
+  siteUrl: `https://authzed.com${process.env.NEXT_PUBLIC_BASE_DIR ?? ''}`,
   generateRobotsTxt: true,
   // ...other options
 };
diff --git a/next.config.mjs b/next.config.mjs
index 7d36b40..d6f2da9 100644
--- a/next.config.mjs
+++ b/next.config.mjs
@@ -39,7 +39,7 @@ const withNextra = nextra({
 })
 
 export default withNextra({
-  basePath: process.env.BASE_DIR ?? undefined,
+  basePath: process.env.NEXT_PUBLIC_BASE_DIR ?? undefined,
   assetPrefix:
     process.env.VERCEL_ENV === 'production'
       ? 'https://docs-authzed.vercel.app/docs'
diff --git a/theme.config.tsx b/theme.config.tsx
index 08d9cd7..f963b69 100644
--- a/theme.config.tsx
+++ b/theme.config.tsx
@@ -21,7 +21,9 @@ const config: DocsThemeConfig = {
       defaultTitle: 'AuthZed Docs',
       titleTemplate: '%s – AuthZed Docs',
       description: desc,
-      canonical: `https://authzed.com${process.env.BASE_DIR ?? ''}${asPath}`, // NOTE: Update this if the base dir ever changes
+      canonical: `https://authzed.com${
+        process.env.NEXT_PUBLIC_BASE_DIR ?? ''
+      }${asPath}`,
       openGraph: {
         title,
         description: desc,