diff --git a/ansible/inventory/test b/ansible/inventory/test
index 7874075..73fb899 100644
--- a/ansible/inventory/test
+++ b/ansible/inventory/test
@@ -41,15 +41,19 @@ toledo-02.aws-eu-central-1a.nimbus.test
 [nimbus-master]
 master-01.aws-eu-central-1a.nimbus.test
 
-[nimbus-slaves-pyrmont]
+[nimbus-pyrmon-devel]
 devel-large-01.aws-eu-central-1a.nimbus.pyrmont
 devel-large-02.aws-eu-central-1a.nimbus.pyrmont
 devel-small-01.aws-eu-central-1a.nimbus.pyrmont
 devel-small-02.aws-eu-central-1a.nimbus.pyrmont
 devel-small-03.aws-eu-central-1a.nimbus.pyrmont
 devel-small-04.aws-eu-central-1a.nimbus.pyrmont
+
+[nimbus-pyrmont-libp2p]
 libp2p-small-01.aws-eu-central-1a.nimbus.pyrmont
 libp2p-small-02.aws-eu-central-1a.nimbus.pyrmont
+
+[nimbus-pyrmont-master]
 master-large-01.aws-eu-central-1a.nimbus.pyrmont
 master-large-02.aws-eu-central-1a.nimbus.pyrmont
 master-small-01.aws-eu-central-1a.nimbus.pyrmont
diff --git a/ansible/pyrmont.yml b/ansible/pyrmont.yml
index d71f837..67a8290 100644
--- a/ansible/pyrmont.yml
+++ b/ansible/pyrmont.yml
@@ -8,7 +8,7 @@
         msg: 'Your Ansible version is lower than 2.8. Upgrade it.'
 
 - name: Configure network pyrmont using master
-  hosts: nimbus-slaves-pyrmont[0:3]
+  hosts: nimbus-pyrmont-master
   vars:
     beacon_node_cont_tag: 'master'
     beacon_node_web3_url: 'wss://goerli.infura.io/ws/v3/675db4626923473591cf6418e4dae175'
@@ -17,7 +17,7 @@
     - { role: infra-role-beacon-node, tags: [ infra-role-beacon-node, beacon-node ] }
 
 - name: Configure network pyrmont using devel
-  hosts: nimbus-slaves-pyrmont[4:7]
+  hosts: nimbus-pyrmont-devel
   vars:
     beacon_node_cont_tag: 'devel'
     beacon_node_web3_url: 'wss://goerli.infura.io/ws/v3/922cc3c4badf4789b68d895267530a4a'
@@ -26,7 +26,7 @@
     - { role: infra-role-beacon-node, tags: [ infra-role-beacon-node, beacon-node ] }
 
 - name: Configure network pyrmont using libp2p
-  hosts: nimbus-slaves-pyrmont[8:9]
+  hosts: nimbus-pyrmont-libp2p
   vars:
     beacon_node_cont_tag: 'libp2p'
     beacon_node_web3_url: 'wss://goerli.infura.io/ws/v3/01cde3e0c47a47ff8dcdc52259b3a71c'
diff --git a/pyrmont.tf b/pyrmont.tf
index ea358de..f0791e7 100644
--- a/pyrmont.tf
+++ b/pyrmont.tf
@@ -4,7 +4,7 @@ module "nimbus_nodes_pyrmont_master_large" {
   name   = "master-large"
   env    = "nimbus"
   stage  = "pyrmont"
-  group  = "nimbus-slaves-pyrmont"
+  group  = "nimbus-pyrmont-master"
   domain = var.domain
 
   /* Scaling */
@@ -31,7 +31,7 @@ module "nimbus_nodes_pyrmont_master_small" {
   name   = "master-small"
   env    = "nimbus"
   stage  = "pyrmont"
-  group  = "nimbus-slaves-pyrmont"
+  group  = "nimbus-pyrmont-master"
   domain = var.domain
 
   /* Scaling */
@@ -58,7 +58,7 @@ module "nimbus_nodes_pyrmont_devel_large" {
   name   = "devel-large"
   env    = "nimbus"
   stage  = "pyrmont"
-  group  = "nimbus-slaves-pyrmont"
+  group  = "nimbus-pyrmont-devel"
   domain = var.domain
 
   /* Scaling */
@@ -85,7 +85,7 @@ module "nimbus_nodes_pyrmont_devel_small" {
   name   = "devel-small"
   env    = "nimbus"
   stage  = "pyrmont"
-  group  = "nimbus-slaves-pyrmont"
+  group  = "nimbus-pyrmont-devel"
   domain = var.domain
 
   /* Scaling */
@@ -112,7 +112,7 @@ module "nimbus_nodes_pyrmont_libp2p_small" {
   name   = "libp2p-small"
   env    = "nimbus"
   stage  = "pyrmont"
-  group  = "nimbus-slaves-pyrmont"
+  group  = "nimbus-pyrmont-libp2p"
   domain = var.domain
 
   /* Scaling */