diff --git a/ansible/geth.yml b/ansible/geth.yml
index abc045a..b2a86e4 100644
--- a/ansible/geth.yml
+++ b/ansible/geth.yml
@@ -14,7 +14,6 @@
   hosts:
     - nimbus-geth-mainnet
   roles:
-    - { role: swap-file,                tags: swap-file }
     - { role: open-ports,               tags: open-ports }
     - { role: smart-metrics,            tags: smart-metrics }
     - { role: infra-role-geth,          tags: infra-role-geth }
@@ -26,7 +25,6 @@
   hosts:
     - nimbus-geth-goerli
   roles:
-    - { role: swap-file,                tags: swap-file }
     - { role: open-ports,               tags: open-ports }
     - { role: smart-metrics,            tags: smart-metrics }
   tasks:
diff --git a/ansible/group_vars/nimbus-geth-goerli.yml b/ansible/group_vars/nimbus-geth-goerli.yml
index d4e4694..edd00ab 100644
--- a/ansible/group_vars/nimbus-geth-goerli.yml
+++ b/ansible/group_vars/nimbus-geth-goerli.yml
@@ -7,6 +7,7 @@ geth_cont_vol: '{{ geth_service_path }}/node'
 geth_network_name: 'goerli'
 geth_sync_mode: 'full'
 geth_log_level_name: info
+geth_consul_advertised_address: '{{ hostname }}.wg'
 # Geth auth & JWT token
 geth_account_pass: '{{lookup("bitwarden", "nimbus/geth", field="password")}}'
 geth_authrpc_jwtsecret: '{{lookup("bitwarden", "nimbus/jwt-token")}}'
@@ -37,10 +38,10 @@ open_ports_list:
 
 nodes_layout:
   # For AWS Prater nodes.
-  'goerli-01.he-eu-hel1.nimbus.geth': [{}, {}, {}]
+  'goerli-01.he-eu-hel1.nimbus.geth': [{}, {}]
 
   # For MacOS Prater nodes.
-  'goerli-02.he-eu-hel1.nimbus.geth': [{}, {}, {}]
+  'goerli-02.he-eu-hel1.nimbus.geth': [{}, {}]
 
   # For Windows prater nodes.
-  'goerli-03.he-eu-hel1.nimbus.geth': [{}, {}, {}]
+  'goerli-03.he-eu-hel1.nimbus.geth': [{}, {}]
diff --git a/ansible/host_vars/macos-01.ms-eu-dublin.nimbus.prater.yml b/ansible/host_vars/macos-01.ms-eu-dublin.nimbus.prater.yml
index 1117149..711fc3f 100644
--- a/ansible/host_vars/macos-01.ms-eu-dublin.nimbus.prater.yml
+++ b/ansible/host_vars/macos-01.ms-eu-dublin.nimbus.prater.yml
@@ -7,10 +7,7 @@ bootstrap__consul_data_center: 'he-eu-hel1'
 beacon_node_max_peers: 200
 
 # Execution layer Enginer API
-beacon_node_exec_layer_urls:
-  - 'http://goerli-01.he-eu-hel1.nimbus.geth.wg:{{ geth_authrpc_port }}'
-  - 'http://goerli-02.he-eu-hel1.nimbus.geth.wg:{{ geth_authrpc_port }}'
-  - 'http://goerli-03.he-eu-hel1.nimbus.geth.wg:{{ geth_authrpc_port }}'
+beacon_node_exec_layer_urls: '{{ beacon_node_exec_layer_urls_discovered_geth }}'
 beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
 
 # ERA Files Generation
diff --git a/ansible/host_vars/stable-large-01.aws-eu-central-1a.nimbus.prater.yml b/ansible/host_vars/stable-large-01.aws-eu-central-1a.nimbus.prater.yml
index e40db3c..879ea47 100644
--- a/ansible/host_vars/stable-large-01.aws-eu-central-1a.nimbus.prater.yml
+++ b/ansible/host_vars/stable-large-01.aws-eu-central-1a.nimbus.prater.yml
@@ -10,5 +10,5 @@ beacon_node_listening_port: 9100
 beacon_node_subscribe_all: true
 
 # Execution layer Enginer API
-beacon_node_exec_layer_urls: ['http://goerli-01.he-eu-hel1.nimbus.geth.wg:8551']
+beacon_node_exec_layer_urls: '{{ beacon_node_exec_layer_urls_discovered_geth }}'
 beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
diff --git a/ansible/host_vars/testing-large-01.aws-eu-central-1a.nimbus.prater.yml b/ansible/host_vars/testing-large-01.aws-eu-central-1a.nimbus.prater.yml
index ce751e8..879ea47 100644
--- a/ansible/host_vars/testing-large-01.aws-eu-central-1a.nimbus.prater.yml
+++ b/ansible/host_vars/testing-large-01.aws-eu-central-1a.nimbus.prater.yml
@@ -10,5 +10,5 @@ beacon_node_listening_port: 9100
 beacon_node_subscribe_all: true
 
 # Execution layer Enginer API
-beacon_node_exec_layer_urls: ['http://goerli-01.he-eu-hel1.nimbus.geth.wg:8552']
+beacon_node_exec_layer_urls: '{{ beacon_node_exec_layer_urls_discovered_geth }}'
 beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
diff --git a/ansible/host_vars/unstable-large-01.aws-eu-central-1a.nimbus.prater.yml b/ansible/host_vars/unstable-large-01.aws-eu-central-1a.nimbus.prater.yml
index c3c4b9a..3325f48 100644
--- a/ansible/host_vars/unstable-large-01.aws-eu-central-1a.nimbus.prater.yml
+++ b/ansible/host_vars/unstable-large-01.aws-eu-central-1a.nimbus.prater.yml
@@ -1,4 +1,4 @@
 ---
 # Execution layer Enginer API
-beacon_node_exec_layer_urls: ['http://goerli-01.he-eu-hel1.nimbus.geth.wg:8553']
+beacon_node_exec_layer_urls: '{{ beacon_node_exec_layer_urls_discovered_geth }}'
 beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
diff --git a/ansible/host_vars/windows-01.he-eu-hel1.nimbus.prater.yml b/ansible/host_vars/windows-01.he-eu-hel1.nimbus.prater.yml
index 4238c05..e01fa54 100644
--- a/ansible/host_vars/windows-01.he-eu-hel1.nimbus.prater.yml
+++ b/ansible/host_vars/windows-01.he-eu-hel1.nimbus.prater.yml
@@ -3,5 +3,5 @@
 bootstrap__defender_enabled: false
 
 # Execution layer Enginer API
-beacon_node_exec_layer_urls: ['http://goerli-03.he-eu-hel1.nimbus.geth.wg:{{ geth_authrpc_port }}']
+beacon_node_exec_layer_urls: '{{ beacon_node_exec_layer_urls_discovered_geth }}'
 beacon_node_exec_layer_jwt_secret: '{{ geth_authrpc_jwtsecret }}'
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index ac6577d..597da79 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -80,7 +80,7 @@
 
 - name: infra-role-rocketpool
   src: git@github.com:status-im/infra-role-rocketpool.git
-  version: d9008250d7d95c48c24fd921c4b1df41e3ae00ce
+  version: 2fb7afec7cb7503789ef03e17a781ac7014590d5
   scm: git
 
 - name: infra-role-winsw
@@ -115,7 +115,7 @@
 
 - name: infra-role-geth
   src: git@github.com:status-im/infra-role-geth.git
-  version: f2fc2892635cf69e1160a6cbeae2212da7202884
+  version: 862d068c736db1b64dd10c3feb2d82124a634b17
   scm: git
 
 - name: infra-role-geth-exporter