diff --git a/keyserver/src/creators/report-creator.js b/keyserver/src/creators/report-creator.js
--- a/keyserver/src/creators/report-creator.js
+++ b/keyserver/src/creators/report-creator.js
@@ -27,11 +27,10 @@
 import { handleAsyncPromise } from '../responders/handlers';
 import { createBotViewer } from '../session/bots';
 import type { Viewer } from '../session/viewer';
-import { getSquadCalURLFacts } from '../utils/urls';
+import { getCommAppURLFacts } from '../utils/urls';
 import createIDs from './id-creator';
 import createMessages from './message-creator';
 
-const { baseDomain, basePath } = getSquadCalURLFacts();
 const { commbot } = bots;
 
 async function createReport(
@@ -145,6 +144,7 @@
   const { platform, codeVersion } = platformDetails;
   const platformString = codeVersion ? `${platform} v${codeVersion}` : platform;
   if (request.type === reportTypes.ERROR) {
+    const { baseDomain, basePath } = getCommAppURLFacts();
     return (
       `${name} got an error :(\n` +
       `using ${platformString}\n` +
diff --git a/keyserver/src/fetchers/upload-fetchers.js b/keyserver/src/fetchers/upload-fetchers.js
--- a/keyserver/src/fetchers/upload-fetchers.js
+++ b/keyserver/src/fetchers/upload-fetchers.js
@@ -5,9 +5,7 @@
 
 import { dbQuery, SQL } from '../database/database';
 import type { Viewer } from '../session/viewer';
-import { getSquadCalURLFacts } from '../utils/urls';
-
-const { baseDomain, basePath } = getSquadCalURLFacts();
+import { getCommAppURLFacts } from '../utils/urls';
 
 type UploadInfo = {
   content: Buffer,
@@ -77,6 +75,7 @@
 }
 
 function getUploadURL(id: string, secret: string): string {
+  const { baseDomain, basePath } = getCommAppURLFacts();
   return `${baseDomain}${basePath}upload/${id}/${secret}`;
 }