diff --git a/ansible/group_vars/nimbus-master.yml b/ansible/group_vars/nimbus-master.yml
deleted file mode 100644
index 18e96e8..0000000
--- a/ansible/group_vars/nimbus-master.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-beacon_node_builds_docker_hub_user: '{{lookup("passwordstore", "cloud/DockerHub/user")}}'
-beacon_node_builds_docker_hub_token: '{{lookup("passwordstore", "cloud/DockerHub/token")}}'
-
-# Master host has more memory, but it should be for builds
-beacon_node_mem_limit: '{{ (ansible_memtotal_mb * 0.25) | int }}'
-beacon_node_mem_reserve: '{{ (ansible_memtotal_mb * 0.2) | int }}'
diff --git a/dns.tf b/dns.tf
deleted file mode 100644
index 64a3f4f..0000000
--- a/dns.tf
+++ /dev/null
@@ -1,17 +0,0 @@
-resource "cloudflare_record" "nimbus_test_stats" {
-  zone_id = local.zones["status.im"]
-  name    = "nimbus-test-stats"
-  type    = "A"
-  proxied = true
-  value   = module.nimbus_master.public_ips[count.index]
-  count   = length(module.nimbus_master.public_ips)
-}
-
-resource "cloudflare_record" "serenity_testnets" {
-  zone_id = local.zones["status.im"]
-  name    = "serenity-testnets"
-  type    = "A"
-  proxied = true
-  value   = module.nimbus_master.public_ips[count.index]
-  count   = length(module.nimbus_master.public_ips)
-}
diff --git a/master.tf b/master.tf
deleted file mode 100644
index ef09ac4..0000000
--- a/master.tf
+++ /dev/null
@@ -1,25 +0,0 @@
-module "nimbus_master" {
-  source = "github.com/status-im/infra-tf-amazon-web-services"
-
-  name   = "master"
-  env    = "nimbus"
-  group  = "nimbus-master"
-  domain = var.domain
-
-  /* Scaling */
-  instance_type = "t3a.large"
-  root_vol_size = 20
-  data_vol_size = 150
-  data_vol_type = "gp2"
-  host_count    = 1
-
-  /* Firewall */
-  open_udp_ports = local.nimbus_ports
-  open_tcp_ports = concat(local.nimbus_ports, [ "80", "443" ])
-
-  /* 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
-}