diff --git a/ansible/group_vars/nimbus.mainnet.yml b/ansible/group_vars/nimbus.mainnet.yml
index 7e1b49f..db0b140 100644
--- a/ansible/group_vars/nimbus.mainnet.yml
+++ b/ansible/group_vars/nimbus.mainnet.yml
@@ -112,8 +112,9 @@ open_ports_default_comment: 'Nimbus REST API'
 open_ports_default_chain: 'VPN'
 open_ports_list:
   - { port: '9300:9310',                       ipset: '{{ env }}.{{ stage }}' }
-  - { port: '9400',                            ipset: 'metrics.hq', comment: 'Geth Exporter' }
-  - { port: '{{ smart_metrics_listen_port }}', ipset: 'metrics.hq', comment: 'SMART Metrics' }
+  - { port: '9400',                            ipset: 'metrics.hq',     comment: 'Geth Exporter' }
+  - { port: '{{ smart_metrics_listen_port }}', ipset: 'metrics.hq',     comment: 'SMART Metrics' }
+  - { port: '{{ geth_authrpc_port }}',         ipset: 'nimbus.mainnet', comment: 'Geth RPC' }
 
 # Split by hostname for more central location
 nodes_layout:
diff --git a/ansible/mainnet.yml b/ansible/mainnet.yml
index 325f3a2..1dbc87e 100644
--- a/ansible/mainnet.yml
+++ b/ansible/mainnet.yml
@@ -31,6 +31,9 @@
   become: true
   serial: '{{ serial|default(1) }}'
   hosts: nimbus-mainnet-metal
+  vars:
+    # FIXME: Use all Geth nodes available in the fleet until we resync.
+    geth_node_api_fleet_name: 'nimbus.{{ beacon_node_network }}'
   roles:
     - { role: swap-file,                    tags: [ swap-file ] }
     - { role: open-ports,                   tags: [ open-ports ] }