diff --git a/defaults/main.yml b/defaults/main.yml
index 772a0a5..bc91eea 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -34,10 +34,11 @@ geth_ipc_path: '/data/geth.ipc'
 geth_websocket_enabled: true
 geth_websocket_port: '{{ geth_rpc_port + 1 | int }}'
 geth_websocket_api: 'eth,net,web3,personal,admin'
+geth_websocket_origins: 'localhost'
 # useful for linking containers
 geth_extra_alias: geth
 geth_aliases:
-  - localhost
+  - 'localhost'
   - '{{ geth_extra_alias }}'
   - '{{ hostname }}'
   - '{{ hostname }}.tinc'
diff --git a/tasks/container.yml b/tasks/container.yml
index 2cca1b7..c07cd55 100644
--- a/tasks/container.yml
+++ b/tasks/container.yml
@@ -70,8 +70,8 @@
       --ws
       --ws.addr=0.0.0.0
       --ws.port={{ geth_websocket_port }}
-      --ws.origins={{ geth_aliases | join(",") }}
       --ws.api={{ geth_websocket_api }}
+      --ws.origins='{{ geth_websocket_origins }}'
       {% endif %}
     volumes:
       - '{{ geth_cont_vol }}/keys:/keys:rw'