diff --git a/ansible/group_vars/nimbus-slaves-pyrmont.yml b/ansible/group_vars/nimbus-slaves-pyrmont.yml
index 93009c5..c11fbe9 100644
--- a/ansible/group_vars/nimbus-slaves-pyrmont.yml
+++ b/ansible/group_vars/nimbus-slaves-pyrmont.yml
@@ -4,15 +4,15 @@ beacon_node_network: 'pyrmont'
 # Distribution of validators and their keys
 dist_validators_layout:
   # master  branch
-  "pyrmont-01.aws-eu-central-1a.nimbus.test": { start:     0, end:  2500 }
-  "pyrmont-02.aws-eu-central-1a.nimbus.test": { start:  2500, end:  5000 }
-  "pyrmont-03.aws-eu-central-1a.nimbus.test": { start:  5000, end:  7500 }
-  "pyrmont-04.aws-eu-central-1a.nimbus.test": { start:  7500, end: 10000 }
+  "master-large-01.aws-eu-central-1a.nimbus.pyrmont": { start:     0, end:  2500 }
+  "master-large-02.aws-eu-central-1a.nimbus.pyrmont": { start:  2500, end:  5000 }
+  "master-small-01.aws-eu-central-1a.nimbus.pyrmont": { start:  5000, end:  7500 }
+  "master-small-02.aws-eu-central-1a.nimbus.pyrmont": { start:  7500, end: 10000 }
   # devel branch
-  "pyrmont-05.aws-eu-central-1a.nimbus.test": { start: 10000, end: 12000 }
-  "pyrmont-06.aws-eu-central-1a.nimbus.test": { start: 12000, end: 14000 }
-  "pyrmont-07.aws-eu-central-1a.nimbus.test": { start: 14000, end: 16000 }
-  "pyrmont-08.aws-eu-central-1a.nimbus.test": { start: 16000, end: 18000 }
+  "devel-large-01.aws-eu-central-1a.nimbus.pyrmont":  { start: 10000, end: 12000 }
+  "devel-large-02.aws-eu-central-1a.nimbus.pyrmont":  { start: 12000, end: 14000 }
+  "devel-small-01.aws-eu-central-1a.nimbus.pyrmont":  { start: 14000, end: 16000 }
+  "devel-small-02.aws-eu-central-1a.nimbus.pyrmont":  { start: 16000, end: 18000 }
   # libp2p branch
-  "pyrmont-09.aws-eu-central-1a.nimbus.test": { start: 18000, end: 19000 }
-  "pyrmont-10.aws-eu-central-1a.nimbus.test": { start: 19000, end: 20000 }
+  "libp2p-small-01.aws-eu-central-1a.nimbus.pyrmont": { start: 18000, end: 19000 }
+  "libp2p-small-02.aws-eu-central-1a.nimbus.pyrmont": { start: 19000, end: 20000 }