diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 3b1dca1..47cc419 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -43,6 +43,8 @@ beacon_node_rest_port: 5052
 beacon_node_metrics_port : 9300
 beacon_node_listening_port: 9100
 beacon_node_discovery_port: 9100
+# Used for some administrative tasks.
+beacon_node_rpc_enabled:    true
 
 # Peers
 beacon_node_max_peers: 320
diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml
index f732357..0f47c4a 100644
--- a/ansible/group_vars/nimbus.prater.yml
+++ b/ansible/group_vars/nimbus.prater.yml
@@ -19,7 +19,6 @@ beacon_node_listening_port: 9000
 beacon_node_metrics_port:   9200
 beacon_node_rest_port:      9300
 beacon_node_rpc_port:       9900
-beacon_node_rpc_enabled:    true
 
 # Tuning
 beacon_node_max_peers: 300
diff --git a/ansible/mainnet.yml b/ansible/mainnet.yml
index cfa64bd..c8e54c8 100644
--- a/ansible/mainnet.yml
+++ b/ansible/mainnet.yml
@@ -34,12 +34,12 @@
         beacon_node_repo_branch: 'unstable'
         beacon_node_threads: '{{ (node.branch == "testing") | ternary(4, 1) }}'
         beacon_node_build_frequency: '{{ node.build_frequency }}'
+        beacon_node_open_firewall: '{{ node.open_firewall | default(true) }}'
         beacon_node_discovery_port: '{{ 9000 + port_offset }}'
         beacon_node_listening_port: '{{ 9000 + port_offset }}'
         beacon_node_metrics_port:   '{{ 9200 + port_offset }}'
         beacon_node_rest_port:      '{{ 9300 + port_offset }}'
         beacon_node_rpc_port:       '{{ 9900 + port_offset }}'
-        beacon_node_rpc_enabled:    true
       with_items:
         - { branch: 'stable',   idx: 1, build_frequency: '*-*-* 12:00:00' }
         - { branch: 'stable',   idx: 2, build_frequency: '*-*-* 13:00:00' }
diff --git a/ansible/prater.yml b/ansible/prater.yml
index beef68b..f5f5f6d 100644
--- a/ansible/prater.yml
+++ b/ansible/prater.yml
@@ -45,7 +45,6 @@
         beacon_node_metrics_port:   '{{ 9200 + port_offset }}'
         beacon_node_rest_port:      '{{ 9300 + port_offset }}'
         beacon_node_rpc_port:       '{{ 9900 + port_offset }}'
-        beacon_node_rpc_enabled:    true
         beacon_node_dist_validators_enabled: '{{ node.start is defined and node.end is defined }}'
         beacon_node_dist_validators_start: '{{ node.start }}'
         beacon_node_dist_validators_end: '{{ node.end }}'
diff --git a/ansible/pyrmont.yml b/ansible/pyrmont.yml
index fd2f200..852acba 100644
--- a/ansible/pyrmont.yml
+++ b/ansible/pyrmont.yml
@@ -31,7 +31,6 @@
         beacon_node_listening_port: '{{ 9000 + port_offset }}'
         beacon_node_metrics_port:   '{{ 9200 + port_offset }}'
         beacon_node_rest_port:      '{{ 9300 + port_offset }}'
-        beacon_node_rpc_enabled:    true
         beacon_node_rpc_port:       '{{ 9900 + port_offset }}'
         beacon_node_dist_validators_start: '{{ validators_layout[hostname][node.name]["start"] | mandatory }}'
         beacon_node_dist_validators_end: '{{ validators_layout[hostname][node.name]["end"] | mandatory }}'