diff --git a/lib/config/index.js b/lib/config/index.js
index 43d3d6a0..9584223b 100644
--- a/lib/config/index.js
+++ b/lib/config/index.js
@@ -7,12 +7,10 @@ module.exports = {
   timeZone: "America/New_York", // https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
   baseUrl:
     // NOTE: no trailing slashes!
-    process.env.NEXT_PUBLIC_VERCEL_ENV === "production"
-      ? "https://jarv.is"
-      : process.env.NEXT_PUBLIC_VERCEL_URL
+    process.env.NEXT_PUBLIC_VERCEL_URL && process.env.NEXT_PUBLIC_VERCEL_ENV !== "production"
       ? `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`
       : process.env.IS_DEV_SERVER
-      ? "http://localhost:3000"
+      ? `http://localhost:${process.env.NEXT_DEV_PORT}`
       : "https://jarv.is", // fallback to production URL
   onionDomain: "http://jarvis2i2vp4j4tbxjogsnqdemnte5xhzyi7hziiyzxwge3hzmh57zad.onion",
   shortDescription: "Front-End Web Developer in Boston, MA",
diff --git a/next.config.js b/next.config.js
index 8aa15d1b..20b3bb78 100644
--- a/next.config.js
+++ b/next.config.js
@@ -31,6 +31,8 @@ module.exports = (phase, { defaultConfig }) => {
       NEXT_PUBLIC_RELEASE_DATE: new Date().toISOString(),
       // check if we're running locally via `next dev`:
       IS_DEV_SERVER: phase === PHASE_DEVELOPMENT_SERVER,
+      // https://nextjs.org/docs/api-reference/cli#development
+      NEXT_DEV_PORT: process.env.PORT || 3000,
     },
     images: {
       deviceSizes: [640, 750, 828, 1080, 1200, 1920],