diff --git a/keyserver/src/socket/tunnelbroker.js b/keyserver/src/socket/tunnelbroker.js
--- a/keyserver/src/socket/tunnelbroker.js
+++ b/keyserver/src/socket/tunnelbroker.js
@@ -23,7 +23,7 @@
 
   console.warn('Defaulting to local Tunnelbroker instance');
   return {
-    url: 'ws://127.0.0.1:51001',
+    url: 'wss://tunnelbroker.staging.commtechnologies.org:51001',
   };
 }
 
diff --git a/lib/facts/tunnelbroker.js b/lib/facts/tunnelbroker.js
--- a/lib/facts/tunnelbroker.js
+++ b/lib/facts/tunnelbroker.js
@@ -3,7 +3,7 @@
 import { isDev } from '../utils/dev-utils.js';
 
 const tunnnelbrokerURL: string = isDev
-  ? 'ws://localhost:51001'
-  : 'https://tunnelbroker.commtechnologies.org';
+  ? 'wss://tunnelbroker.staging.commtechnologies.org:51001'
+  : 'wss://tunnelbroker.commtechnologies.org:51001';
 
 export { tunnnelbrokerURL };