diff --git a/lib/facts/bots.js b/lib/facts/bots.js
--- a/lib/facts/bots.js
+++ b/lib/facts/bots.js
@@ -10,7 +10,7 @@
 const bots: Bots = {
   commbot: {
     userID: '5',
-    staffThreadID: '83794',
+    staffThreadID: process.env['KEYSERVER'] ? '83794' : '256|83794',
   },
 };
 
diff --git a/lib/facts/comm-staff-community.js b/lib/facts/comm-staff-community.js
--- a/lib/facts/comm-staff-community.js
+++ b/lib/facts/comm-staff-community.js
@@ -5,7 +5,7 @@
 };
 
 const commStaffCommunity: CommStaffCommunity = {
-  id: '311733',
+  id: process.env['KEYSERVER'] ? '311733' : '256|311733',
 };
 
 export default commStaffCommunity;