diff --git a/ansible/group_vars/nimbus.ropsten.yml b/ansible/group_vars/nimbus.ropsten.yml
index 30632a5..c2a2af6 100644
--- a/ansible/group_vars/nimbus.ropsten.yml
+++ b/ansible/group_vars/nimbus.ropsten.yml
@@ -41,7 +41,7 @@ beacon_node_build_frequency: 'daily'
 beacon_node_validator_monitor_auto: true
 beacon_node_validator_monitor_totals: true
 # HTTP RPC support is unstable
-beacon_node_web3_urls: '{{ beacon_node_web3_urls_all | reject("match", "^http://") }}'
+beacon_node_web3_urls: ['ws://localhost:{{ geth_websocket_port }}']
 beacon_node_extra_flags: ['--terminal-total-difficulty-override=50000000000000000']
 # Validators from nimbus-private repo
 beacon_node_dist_validators_enabled: '{{ node.start is defined and node.end is defined }}'
@@ -61,9 +61,7 @@ bootstrap__extra_volume_bind_path: ''
 
 nodes_layout:
   'metal-01.he-eu-hel1.nimbus.ropsten':
-    # FIXME: Temporary layout change due to one Geth instance.
-    - { start:    0, end:  10000 }
-    - { }
-    - { }
-    - { }
-
+    - { start:     0, end:  2500 }
+    - { start:  2500, end:  5000 }
+    - { start:  5000, end:  7500 }
+    - { start:  7500, end: 10000 }
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index 030f237..8ae6e46 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -46,7 +46,7 @@
 
 - name: infra-role-beacon-node-linux
   src: git@github.com:status-im/infra-role-beacon-node-linux.git
-  version: a3a5d18b7bf05b1f57363445e903d668dc536361
+  version: 1e7e441a06dcbecdd6c0ce050dbffb28c462e7d8
   scm: git
 
 - name: infra-role-beacon-node-windows
@@ -71,7 +71,7 @@
 
 - name: infra-role-dist-validators
   src: git@github.com:status-im/infra-role-dist-validators.git
-  version: 0da551085f6562f6aac6357234d38cefe135deb3
+  version: dfc2adb3bd713cef23bd142a7b04b0b43e0c650a
   scm: git
 
 - name: infra-role-rocketpool