diff --git a/ansible/group_vars/nimbus.mainnet.yml b/ansible/group_vars/nimbus.mainnet.yml
index 3218ae1..9981685 100644
--- a/ansible/group_vars/nimbus.mainnet.yml
+++ b/ansible/group_vars/nimbus.mainnet.yml
@@ -2,7 +2,8 @@
 swap_file_size_mb: 2048
 
 beacon_node_network: 'mainnet'
-beacon_node_repo_branch: '{{ node.branch }}'
+# TODO This is to avoid too long service names.
+beacon_node_repo_branch: '{{ (node.branch == "libp2p") | ternary("nim-libp2p-auto-bump-unstable", node.branch) }}'
 # TODO Drop this once all nodes have an number.
 service_number: '{{ node.get("num", False) | ternary(("-%02d"|format(node.get("num", 0))), "") }}'
 beacon_node_service_name: 'beacon-node-{{ beacon_node_network }}-{{ node.branch }}{{ service_number }}'
@@ -70,6 +71,8 @@ nodes_layout:
     - { branch: 'testing',  num: 2 }
     - { branch: 'unstable', num: 1 }
     - { branch: 'unstable', num: 2 }
+    - { branch: 'libp2p',   num: 1 }
+    - { branch: 'libp2p',   num: 2 }
 
   'metal-06.he-eu-hel1.nimbus.mainnet':
     - { branch: 'stable',   num: 1 }
@@ -78,3 +81,5 @@ nodes_layout:
     - { branch: 'testing',  num: 2 }
     - { branch: 'unstable', num: 1 }
     - { branch: 'unstable', num: 2 }
+    - { branch: 'libp2p',   num: 1 }
+    - { branch: 'libp2p',   num: 2 }