diff --git a/ansible-scylla-node/defaults/main.yml b/ansible-scylla-node/defaults/main.yml
index c601f7c4..b8afe75c 100644
--- a/ansible-scylla-node/defaults/main.yml
+++ b/ansible-scylla-node/defaults/main.yml
@@ -187,7 +187,8 @@ scylla_seeds:
 scylla_listen_address: "{{ vars['ansible_'~scylla_nic].ipv4.address }}"
 scylla_rpc_address: "{{ vars['ansible_'~scylla_nic].ipv4.address }}"
 scylla_broadcast_address: "{{ vars['ansible_'~scylla_nic].ipv4.address }}"
-scylla_broadcast_rpc_address: "{{ scylla_rpc_address }}"
+scylla_broadcast_rpc_address: "{{ scylla_listen_address if scylla_rpc_address == '0.0.0.0' else scylla_rpc_address }}"
+scylla_prometheus_address: "{{ scylla_listen_address }}"
 
 scylla_api_address: '127.0.0.1'
 scylla_api_port: '10000'
diff --git a/ansible-scylla-node/templates/scylla.yaml.j2 b/ansible-scylla-node/templates/scylla.yaml.j2
index ef21f21d..9d2f7c81 100644
--- a/ansible-scylla-node/templates/scylla.yaml.j2
+++ b/ansible-scylla-node/templates/scylla.yaml.j2
@@ -32,6 +32,7 @@ endpoint_snitch: {{ scylla_snitch }}
 rpc_address: {{ scylla_rpc_address }}
 broadcast_address: {{ scylla_broadcast_address }}
 broadcast_rpc_address: {{ scylla_broadcast_rpc_address }}
+prometheus_address: {{ scylla_prometheus_address }}
 rpc_port: 9160
 api_port: {{ scylla_api_port }}
 api_address: {{ scylla_api_address }}