diff --git a/defaults/main.yml b/defaults/main.yml
index 24849c2..d6100e3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -48,7 +48,7 @@ geth_websocket_enabled: true
 geth_websocket_addr: '127.0.0.1'
 geth_websocket_port: '{{ geth_rpc_port + 1 | int }}'
 geth_websocket_api: 'eth,net,web3,personal,admin,engine'
-geth_websocket_origins: 'localhost'
+geth_websocket_origins: '{{ geth_rpc_vhosts }}'
 
 # Engine API
 geth_authrpc_enabled: true
diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index 547a700..f9f16b9 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -69,7 +69,7 @@ services:
       --ws.addr=0.0.0.0
       --ws.port={{ geth_websocket_port }}
       --ws.api={{ geth_websocket_api }}
-      --ws.origins='{{ geth_websocket_origins }}'
+      --ws.origins={{ geth_websocket_origins | sort | join(",") }}
 {% endif %}
 {% if geth_authrpc_enabled %}
       --authrpc.addr=0.0.0.0