diff --git a/lib/facts/bots.js b/lib/facts/bots.js
index 021ed9522..aa9eb27d0 100644
--- a/lib/facts/bots.js
+++ b/lib/facts/bots.js
@@ -1,17 +1,17 @@
 // @flow
 
 type Bots = {
   +commbot: {
     +userID: string,
     +staffThreadID: string,
   },
 };
 
 const bots: Bots = {
   commbot: {
     userID: '5',
-    staffThreadID: '83794',
+    staffThreadID: process.env['KEYSERVER'] ? '83794' : '256|83794',
   },
 };
 
 export default bots;
diff --git a/lib/facts/comm-staff-community.js b/lib/facts/comm-staff-community.js
index c8fc62b77..f4e6a64a5 100644
--- a/lib/facts/comm-staff-community.js
+++ b/lib/facts/comm-staff-community.js
@@ -1,11 +1,11 @@
 // @flow
 
 type CommStaffCommunity = {
   +id: string,
 };
 
 const commStaffCommunity: CommStaffCommunity = {
-  id: '311733',
+  id: process.env['KEYSERVER'] ? '311733' : '256|311733',
 };
 
 export default commStaffCommunity;