diff --git a/ansible/group_vars/nimbus.mainnet.yml b/ansible/group_vars/nimbus.mainnet.yml
index b680772..4f5ce13 100644
--- a/ansible/group_vars/nimbus.mainnet.yml
+++ b/ansible/group_vars/nimbus.mainnet.yml
@@ -33,8 +33,10 @@ geth_expo_cont_port: 9400
 
 # Nimbus Beacon Node
 beacon_node_network: 'mainnet'
-# TODO This is to avoid too long service names.
-beacon_node_repo_branch: '{{ (node.branch == "libp2p") | ternary("nim-libp2p-auto-bump-unstable", node.branch) }}'
+beacon_node_repo_branch: '{{ node_name_to_branch_map.get(node.branch, node.branch) }}'
+# We map short names to branches to avoid too long service names.
+node_name_to_branch_map:
+  libp2p: 'nim-libp2p-auto-bump-unstable'
 # 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 | mandatory }}{{ service_number }}'
diff --git a/ansible/group_vars/nimbus.prater.yml b/ansible/group_vars/nimbus.prater.yml
index d70d336..80c5b4b 100644
--- a/ansible/group_vars/nimbus.prater.yml
+++ b/ansible/group_vars/nimbus.prater.yml
@@ -61,12 +61,10 @@ erigon_authrpc_jwtsecret: '{{lookup("bitwarden", "nimbus/jwt-token")}}'
 beacon_node_service_name: 'beacon-node-{{ beacon_node_network }}-{{ node.branch }}'
 beacon_node_network: 'prater'
 beacon_node_era_dir_path: '{{ nimbus_era_files_timer_path }}'
-# TODO This is to avoid too long service names.
-beacon_node_repo_branch: >-
-  {{ node.branch_override is defined | ternary(
-       node.branch_override,
-       ((node.branch == "libp2p") | ternary("nim-libp2p-auto-bump-unstable", node.branch))
-     ) }}
+beacon_node_repo_branch: '{{ node_name_to_branch_map.get(node.branch, node.branch) }}'
+# We map short names to branches to avoid too long service names.
+node_name_to_branch_map:
+  libp2p: 'nim-libp2p-auto-bump-unstable'
 # Ports
 beacon_node_discovery_port: '{{ 9000 + idx }}'
 beacon_node_listening_port: '{{ 9000 + idx }}'