diff --git a/services/tunnelbroker/src/grpc/mod.rs b/services/tunnelbroker/src/grpc/mod.rs
--- a/services/tunnelbroker/src/grpc/mod.rs
+++ b/services/tunnelbroker/src/grpc/mod.rs
@@ -73,7 +73,7 @@
   client: DatabaseClient,
   ampq_connection: &lapin::Connection,
 ) -> Result<(), tonic::transport::Error> {
-  let addr = format!("[::1]:{}", CONFIG.grpc_port)
+  let addr = format!("[::]:{}", CONFIG.grpc_port)
     .parse()
     .expect("Unable to parse gRPC address");
 
@@ -82,7 +82,7 @@
     .await
     .expect("Unable to create amqp channel");
 
-  tracing::info!("Websocket server listening on {}", &addr);
+  tracing::info!("gRPC server listening on {}", &addr);
   Server::builder()
     .http2_keepalive_interval(Some(constants::GRPC_KEEP_ALIVE_PING_INTERVAL))
     .http2_keepalive_timeout(Some(constants::GRPC_KEEP_ALIVE_PING_TIMEOUT))
diff --git a/services/tunnelbroker/src/websockets/mod.rs b/services/tunnelbroker/src/websockets/mod.rs
--- a/services/tunnelbroker/src/websockets/mod.rs
+++ b/services/tunnelbroker/src/websockets/mod.rs
@@ -19,10 +19,10 @@
   amqp_connection: &lapin::Connection,
 ) -> Result<(), Error> {
   let addr = env::var("COMM_TUNNELBROKER_WEBSOCKET_ADDR")
-    .unwrap_or_else(|_| format!("127.0.0.1:{}", &CONFIG.http_port));
+    .unwrap_or_else(|_| format!("0.0.0.0:{}", &CONFIG.http_port));
 
   let listener = TcpListener::bind(&addr).await.expect("Failed to bind");
-  info!("Listening on: {}", addr);
+  info!("WebSocket listening on: {}", addr);
 
   while let Ok((stream, addr)) = listener.accept().await {
     let channel = amqp_connection