diff --git a/ansible/inventory/test b/ansible/inventory/test
index f1590cb..ef38e6c 100644
--- a/ansible/inventory/test
+++ b/ansible/inventory/test
@@ -11,6 +11,8 @@ node-06.aws-eu-central-1a.nimbus.test hostname=node-06.aws-eu-central-1a.nimbus.
 node-07.aws-eu-central-1a.nimbus.test hostname=node-07.aws-eu-central-1a.nimbus.test ansible_host=18.158.142.165 env=nimbus stage=test data_center=aws-eu-central-1a region=eu-central-1a dns_entry=node-07.aws-eu-central-1a.nimbus.test.statusim.net
 node-08.aws-eu-central-1a.nimbus.test hostname=node-08.aws-eu-central-1a.nimbus.test ansible_host=18.159.24.222 env=nimbus stage=test data_center=aws-eu-central-1a region=eu-central-1a dns_entry=node-08.aws-eu-central-1a.nimbus.test.statusim.net
 node-09.aws-eu-central-1a.nimbus.test hostname=node-09.aws-eu-central-1a.nimbus.test ansible_host=18.195.193.55 env=nimbus stage=test data_center=aws-eu-central-1a region=eu-central-1a dns_entry=node-09.aws-eu-central-1a.nimbus.test.statusim.net
+toledo-01.aws-eu-central-1a.nimbus.test hostname=toledo-01.aws-eu-central-1a.nimbus.test ansible_host=3.124.147.227 env=nimbus stage=test data_center=aws-eu-central-1a region=eu-central-1a dns_entry=toledo-01.aws-eu-central-1a.nimbus.test.statusim.net
+toledo-02.aws-eu-central-1a.nimbus.test hostname=toledo-02.aws-eu-central-1a.nimbus.test ansible_host=18.196.164.28 env=nimbus stage=test data_center=aws-eu-central-1a region=eu-central-1a dns_entry=toledo-02.aws-eu-central-1a.nimbus.test.statusim.net
 
 [aws-eu-central-1a]
 master-01.aws-eu-central-1a.nimbus.test
@@ -23,6 +25,8 @@ node-06.aws-eu-central-1a.nimbus.test
 node-07.aws-eu-central-1a.nimbus.test
 node-08.aws-eu-central-1a.nimbus.test
 node-09.aws-eu-central-1a.nimbus.test
+toledo-01.aws-eu-central-1a.nimbus.test
+toledo-02.aws-eu-central-1a.nimbus.test
 
 [nimbus-master]
 master-01.aws-eu-central-1a.nimbus.test
@@ -38,6 +42,10 @@ node-07.aws-eu-central-1a.nimbus.test
 node-08.aws-eu-central-1a.nimbus.test
 node-09.aws-eu-central-1a.nimbus.test
 
+[nimbus-slaves-toledo]
+toledo-01.aws-eu-central-1a.nimbus.test
+toledo-02.aws-eu-central-1a.nimbus.test
+
 [nimbus.test]
 master-01.aws-eu-central-1a.nimbus.test
 node-01.aws-eu-central-1a.nimbus.test
@@ -49,4 +57,6 @@ node-06.aws-eu-central-1a.nimbus.test
 node-07.aws-eu-central-1a.nimbus.test
 node-08.aws-eu-central-1a.nimbus.test
 node-09.aws-eu-central-1a.nimbus.test
+toledo-01.aws-eu-central-1a.nimbus.test
+toledo-02.aws-eu-central-1a.nimbus.test
 
diff --git a/ansible/nimbus.yml b/ansible/nimbus.yml
index c7e757f..e6d08a5 100644
--- a/ansible/nimbus.yml
+++ b/ansible/nimbus.yml
@@ -35,3 +35,11 @@
   roles:
     - { role: infra-role-beacon-node, tags: [ infra-role-beacon-node, beacon-node ] }
     - { role: network-debug-script,   tags: [ network-debug-script ] }
+
+- name: Configure network toledo using develop
+  hosts: nimbus-slaves-toledo
+  vars:
+    beacon_node_network: 'toledo'
+    beacon_node_repo_branch: 'devel'
+  roles:
+    - { role: infra-role-beacon-node, tags: [ infra-role-beacon-node, beacon-node ] }
diff --git a/nimbus.tf b/nimbus.tf
index ffa77a7..6999eae 100644
--- a/nimbus.tf
+++ b/nimbus.tf
@@ -73,6 +73,32 @@ module "nimbus_nodes" {
   keypair_name = aws_key_pair.jakubgs.key_name
 }
 
+module "nimbus_nodes_toledo" {
+  source = "github.com/status-im/infra-tf-amazon-web-services"
+
+  name   = "toledo"
+  env    = "nimbus"
+  group  = "nimbus-slaves-toledo"
+  domain = var.domain
+
+  /* Scaling */
+  instance_type = "t3a.medium"
+  root_vol_size = 20
+  data_vol_size = 150
+  data_vol_type = "gp2"
+  host_count    = 2
+
+  /* Firewall */
+  open_udp_ports = local.nimbus_ports
+  open_tcp_ports = local.nimbus_ports
+
+  /* Plumbing */
+  vpc_id       = module.nimbus_network.vpc.id
+  subnet_id    = module.nimbus_network.subnets[0].id
+  secgroup_id  = module.nimbus_network.secgroup.id
+  keypair_name = aws_key_pair.jakubgs.key_name
+}
+
 /* DNS ------------------------------------------*/
 
 resource "cloudflare_record" "nimbus_test_stats" {