diff --git a/desktop/app/package.json b/desktop/app/package.json
index c225870f6..fd61490e1 100644
--- a/desktop/app/package.json
+++ b/desktop/app/package.json
@@ -69,7 +69,6 @@
   "devDependencies": {
     "@testing-library/react": "^10.0.2",
     "flipper-test-utils": "0.47.0",
-    "mac-ca": "^1.0.4",
     "metro": "^0.59.0",
     "mock-fs": "^4.12.0",
     "pretty-format": "^25.4.0",
diff --git a/desktop/pkg-lib/src/runBuild.ts b/desktop/pkg-lib/src/runBuild.ts
index a5c8b91aa..8de5a5728 100644
--- a/desktop/pkg-lib/src/runBuild.ts
+++ b/desktop/pkg-lib/src/runBuild.ts
@@ -35,6 +35,9 @@ export default async function runBuild(
   out: string,
   dev: boolean,
 ) {
+  const sourceMapUrl = path.basename(
+    out.substring(0, out.lastIndexOf('.')) + '.map',
+  );
   const baseConfig = await Metro.loadConfig();
   const config = Object.assign({}, baseConfig, {
     reporter: {update: () => {}},
@@ -70,6 +73,7 @@ export default async function runBuild(
     minify: !dev,
     resetCache: !dev,
     sourceMap: dev,
+    sourceMapUrl,
     entry,
     out,
   });
diff --git a/desktop/scripts/build-utils.ts b/desktop/scripts/build-utils.ts
index 4546f0bdd..12310423d 100644
--- a/desktop/scripts/build-utils.ts
+++ b/desktop/scripts/build-utils.ts
@@ -74,6 +74,8 @@ async function compile(
   watchFolders: string[],
   entry: string,
 ) {
+  const out = path.join(buildFolder, 'bundle.js');
+  const sourceMapUrl = dev ? 'bundle.map' : undefined;
   await Metro.runBuild(
     {
       reporter: {update: () => {}},
@@ -98,8 +100,9 @@ async function compile(
       minify: !dev,
       resetCache: !dev,
       sourceMap: dev,
+      sourceMapUrl,
       entry,
-      out: path.join(buildFolder, 'bundle.js'),
+      out,
     },
   );
 }
diff --git a/desktop/static/package.json b/desktop/static/package.json
index 8063998ba..04ad577f9 100644
--- a/desktop/static/package.json
+++ b/desktop/static/package.json
@@ -13,6 +13,7 @@
     "flipper-plugin-lib": "0.47.0",
     "fs-extra": "^8.1.0",
     "ignore": "^5.1.4",
+    "mac-ca": "^1.0.4",
     "mem": "^6.0.0",
     "mkdirp": "^1.0.4",
     "p-filter": "^2.1.0",