diff --git a/ansible/group_vars/nimbus-slaves-toledo.yml b/ansible/group_vars/nimbus-toledo-devel.yml
similarity index 76%
rename from ansible/group_vars/nimbus-slaves-toledo.yml
rename to ansible/group_vars/nimbus-toledo-devel.yml
index ed1512a..a846707 100644
--- a/ansible/group_vars/nimbus-slaves-toledo.yml
+++ b/ansible/group_vars/nimbus-toledo-devel.yml
@@ -1,6 +1,6 @@
 ---
 beacon_node_network: 'toledo'
-beacon_node_cont_tag: 'toledo'
+beacon_node_cont_tag: 'devel-{{ (hostname is search("large")) | ternary("large", "small") }}'
 beacon_node_cont_entrypoint: '/usr/local/bin/nimbus_beacon_node'
 
 # Distribution of validators and their keys
diff --git a/ansible/host_vars/master-small-01.aws-eu-central-1a.nimbus.pyrmont.yml b/ansible/host_vars/master-small-01.aws-eu-central-1a.nimbus.pyrmont.yml
index 917da9f..ed56dd7 100644
--- a/ansible/host_vars/master-small-01.aws-eu-central-1a.nimbus.pyrmont.yml
+++ b/ansible/host_vars/master-small-01.aws-eu-central-1a.nimbus.pyrmont.yml
@@ -17,7 +17,3 @@ beacon_node_builds_branches:
     branch: 'nim-libp2p-auto-bump'
     targets: ['nimbus_beacon_node', 'nimbus_signing_process']
     frequency: '*-*-* 18:00:00'
-  - name: 'toledo-small'
-    branch: 'devel'
-    targets: ['nimbus_beacon_node', 'nimbus_signing_process']
-    frequency: '*-*-* 20:00:00'
diff --git a/ansible/inventory/test b/ansible/inventory/test
index a05aae3..bb69c0d 100644
--- a/ansible/inventory/test
+++ b/ansible/inventory/test
@@ -56,7 +56,7 @@ master-small-02.aws-eu-central-1a.nimbus.pyrmont
 master-small-03.aws-eu-central-1a.nimbus.pyrmont
 master-small-04.aws-eu-central-1a.nimbus.pyrmont
 
-[nimbus-slaves-toledo]
+[nimbus-toledo-devel]
 toledo-01.aws-eu-central-1a.nimbus.test
 toledo-02.aws-eu-central-1a.nimbus.test
 
diff --git a/ansible/toledo.yml b/ansible/toledo.yml
index 146759b..8559a55 100644
--- a/ansible/toledo.yml
+++ b/ansible/toledo.yml
@@ -8,7 +8,7 @@
         msg: 'Your Ansible version is lower than 2.8. Upgrade it.'
 
 - name: Configure network toledo using develop
-  hosts: nimbus-slaves-toledo
+  hosts: nimbus-toledo-devel
   roles:
     - { role: distribute-validators,  tags: [ distribute-validators ] }
     - { role: infra-role-beacon-node, tags: [ infra-role-beacon-node, beacon-node ] }
diff --git a/toledo.tf b/toledo.tf
index e6a1eff..c06871b 100644
--- a/toledo.tf
+++ b/toledo.tf
@@ -3,7 +3,7 @@ module "nimbus_nodes_toledo" {
 
   name   = "toledo"
   env    = "nimbus"
-  group  = "nimbus-slaves-toledo"
+  group  = "nimbus-toledo-devel"
   domain = var.domain
 
   /* Scaling */