diff --git a/resources/terraform/devnet/main.tf b/resources/terraform/devnet/main.tf
index bce67eba..c2a0b7e4 100644
--- a/resources/terraform/devnet/main.tf
+++ b/resources/terraform/devnet/main.tf
@@ -10,10 +10,10 @@ module "devnet" {
     regions            = var.aws_region
     instance-count     = var.instance_count["bootstrap"]
     docker-org         = "autonomys"
-    docker-tag         = "mainnet-2024-nov-18"
+    docker-tag         = "test-mainnet-upgrade"
     reserved-only      = false
     prune              = false
-    genesis-hash       = "b256e3ca1d3ef43c1e52799df670aa307671b9e468c500def1f5b6b77173b5d4"
+    genesis-hash       = "296aab9fb53eeb37a1757b35ed4c4b6c6f903d6b996cf7cd908a753f6eb762d5"
     dsn-listen-port    = 30533
     node-dsn-port      = 30433
     disk-volume-size   = var.disk_volume_size
@@ -26,10 +26,10 @@ module "devnet" {
     regions            = var.aws_region
     instance-count     = var.instance_count["evm_bootstrap"]
     docker-org         = "autonomys"
-    docker-tag         = "mainnet-2024-nov-18"
+    docker-tag         = "test-mainnet-upgrade"
     reserved-only      = false
     prune              = false
-    genesis-hash       = "b256e3ca1d3ef43c1e52799df670aa307671b9e468c500def1f5b6b77173b5d4"
+    genesis-hash       = "296aab9fb53eeb37a1757b35ed4c4b6c6f903d6b996cf7cd908a753f6eb762d5"
     dsn-listen-port    = 30533
     node-dsn-port      = 30433
     operator-port      = 30334
@@ -43,10 +43,10 @@ module "devnet" {
     regions            = var.aws_region
     instance-count     = var.instance_count["autoid_bootstrap"]
     docker-org         = "autonomys"
-    docker-tag         = "mainnet-2024-nov-18"
+    docker-tag         = "test-mainnet-upgrade"
     reserved-only      = false
     prune              = false
-    genesis-hash       = "b256e3ca1d3ef43c1e52799df670aa307671b9e468c500def1f5b6b77173b5d4"
+    genesis-hash       = "296aab9fb53eeb37a1757b35ed4c4b6c6f903d6b996cf7cd908a753f6eb762d5"
     dsn-listen-port    = 30533
     node-dsn-port      = 30433
     operator-port      = 30334
@@ -60,7 +60,7 @@ module "devnet" {
     regions            = var.aws_region
     instance-count     = var.instance_count["rpc-indexer"]
     docker-org         = "autonomys"
-    docker-tag         = "mainnet-2024-nov-18"
+    docker-tag         = "test-mainnet-upgrade"
     domain-prefix      = "rpc-indexer"
     reserved-only      = false
     prune              = false
@@ -75,7 +75,7 @@ module "devnet" {
     regions            = var.aws_region
     instance-count     = var.instance_count["auto-evm-indexer"]
     docker-org         = "autonomys"
-    docker-tag         = "mainnet-2024-nov-18"
+    docker-tag         = "test-mainnet-upgrade"
     domain-prefix      = "auto-evm-indexer"
     reserved-only      = false
     prune              = false
@@ -93,7 +93,7 @@ module "devnet" {
     regions            = var.aws_region
     instance-count     = var.instance_count["rpc"]
     docker-org         = "autonomys"
-    docker-tag         = "mainnet-2024-nov-18"
+    docker-tag         = "test-mainnet-upgrade"
     domain-prefix      = "rpc"
     reserved-only      = false
     prune              = false
@@ -108,7 +108,7 @@ module "devnet" {
     regions            = var.aws_region
     instance-count     = var.instance_count["domain"]
     docker-org         = "autonomys"
-    docker-tag         = "mainnet-2024-nov-18"
+    docker-tag         = "test-mainnet-upgrade"
     domain-prefix      = ["auto-evm", "autoid"]
     reserved-only      = false
     prune              = false
@@ -126,7 +126,7 @@ module "devnet" {
     regions                = var.aws_region
     instance-count         = var.instance_count["farmer"]
     docker-org             = "autonomys"
-    docker-tag             = "mainnet-2024-nov-18"
+    docker-tag             = "test-mainnet-upgrade"
     reserved-only          = false
     prune                  = false
     plot-size              = "10G"
diff --git a/resources/terraform/devnet/variables.tf b/resources/terraform/devnet/variables.tf
index d954d3e6..9ab05b22 100644
--- a/resources/terraform/devnet/variables.tf
+++ b/resources/terraform/devnet/variables.tf
@@ -32,14 +32,14 @@ variable "domain_labels" {
 variable "instance_type" {
   type = map(string)
   default = {
-    bootstrap        = "m7a.xlarge"
-    rpc              = "m7a.xlarge"
-    domain           = "m7a.xlarge"
-    rpc-indexer      = "m7a.xlarge"
-    auto-evm-indexer = "m7a.xlarge"
+    bootstrap        = "m6a.xlarge"
+    rpc              = "m6a.xlarge"
+    domain           = "m6a.xlarge"
+    rpc-indexer      = "m6a.xlarge"
+    auto-evm-indexer = "m6a.xlarge"
     farmer           = "c7a.2xlarge"
-    evm_bootstrap    = "m7a.xlarge"
-    autoid_bootstrap = "m7a.xlarge"
+    evm_bootstrap    = "m6a.xlarge"
+    autoid_bootstrap = "m6a.xlarge"
   }
 }
 
@@ -67,8 +67,8 @@ variable "instance_count" {
     autoid           = 0
     rpc-indexer      = 0
     auto-evm-indexer = 0
-    farmer           = 1
-    evm_bootstrap    = 0
+    farmer           = 0
+    evm_bootstrap    = 1
     autoid_bootstrap = 0
   }
 }
diff --git a/resources/terraform/mainnet/main.tf b/resources/terraform/mainnet/main.tf
index e5887cda..af2caa3a 100644
--- a/resources/terraform/mainnet/main.tf
+++ b/resources/terraform/mainnet/main.tf
@@ -26,7 +26,7 @@ module "mainnet" {
     regions            = var.aws_region
     instance-count     = var.instance_count["evm_bootstrap"]
     docker-org         = "autonomys"
-    docker-tag         = "mainnet-2025-jan-14"
+    docker-tag         = "mainnet-2025-jun-06"
     reserved-only      = false
     prune              = false
     genesis-hash       = "b256e3ca1d3ef43c1e52799df670aa307671b9e468c500def1f5b6b77173b5d4"
@@ -43,7 +43,7 @@ module "mainnet" {
     regions            = var.aws_region
     instance-count     = var.instance_count["autoid_bootstrap"]
     docker-org         = "autonomys"
-    docker-tag         = "mainnet-2025-jan-14"
+    docker-tag         = "mainnet-2025-jun-06"
     reserved-only      = false
     prune              = false
     genesis-hash       = "b256e3ca1d3ef43c1e52799df670aa307671b9e468c500def1f5b6b77173b5d4"
@@ -60,7 +60,7 @@ module "mainnet" {
     regions            = var.aws_region
     instance-count     = var.instance_count["rpc-indexer"]
     docker-org         = "autonomys"
-    docker-tag         = "mainnet-2025-jan-14"
+    docker-tag         = "mainnet-2025-jun-06"
     domain-prefix      = "rpc-indexer"
     reserved-only      = false
     prune              = false
@@ -75,7 +75,7 @@ module "mainnet" {
     regions            = var.aws_region
     instance-count     = var.instance_count["auto-evm-indexer"]
     docker-org         = "autonomys"
-    docker-tag         = "mainnet-2025-jan-14"
+    docker-tag         = "mainnet-2025-jun-06"
     domain-prefix      = "auto-evm-indexer"
     reserved-only      = false
     prune              = false
@@ -93,7 +93,7 @@ module "mainnet" {
     regions            = var.aws_region
     instance-count     = var.instance_count["rpc"]
     docker-org         = "autonomys"
-    docker-tag         = "mainnet-2025-jan-14"
+    docker-tag         = "mainnet-2025-jun-06"
     domain-prefix      = "rpc"
     reserved-only      = false
     prune              = false
@@ -108,7 +108,7 @@ module "mainnet" {
     regions            = var.aws_region
     instance-count     = var.instance_count["domain"]
     docker-org         = "autonomys"
-    docker-tag         = "mainnet-2025-jan-14"
+    docker-tag         = "mainnet-2025-jun-06"
     domain-prefix      = ["auto-evm", "autoid"]
     reserved-only      = false
     prune              = false
@@ -126,7 +126,7 @@ module "mainnet" {
     regions                = var.aws_region
     instance-count         = var.instance_count["farmer"]
     docker-org             = "autonomys"
-    docker-tag             = "mainnet-2025-jan-14"
+    docker-tag             = "mainnet-2025-jun-06"
     reserved-only          = false
     prune                  = false
     plot-size              = "10G"
@@ -142,6 +142,7 @@ module "mainnet" {
 
   cloudflare_api_token = var.cloudflare_api_token
   cloudflare_email     = var.cloudflare_email
+  cloudflare_zone_id   = var.cloudflare_zone_id
   nr_api_key           = var.nr_api_key
   access_key           = var.access_key
   secret_key           = var.secret_key
diff --git a/resources/terraform/mainnet/variables.tf b/resources/terraform/mainnet/variables.tf
index 07fc741a..bc376df4 100644
--- a/resources/terraform/mainnet/variables.tf
+++ b/resources/terraform/mainnet/variables.tf
@@ -4,6 +4,12 @@ variable "network_name" {
   default     = "mainnet"
 
 }
+
+variable "cloudflare_zone_id" {
+  description = "Cloudflare zone ID"
+  type        = string
+}
+
 variable "farmer_reward_address" {
   description = "Farmer's reward address"
   type        = string
@@ -49,19 +55,19 @@ variable "vpc_cidr_block" {
 variable "azs" {
   type        = string
   description = "Availability Zones"
-  default     = "us-east-1a"
+  default     = "us-west-1a"
 }
 
 variable "instance_count" {
   type = map(number)
   default = {
-    bootstrap        = 2
-    rpc              = 2
-    domain           = 2
-    rpc-indexer      = 1
+    bootstrap        = 0
+    rpc              = 0
+    domain           = 4
+    rpc-indexer      = 0
     auto-evm-indexer = 0
-    farmer           = 1
-    evm_bootstrap    = 0
+    farmer           = 0
+    evm_bootstrap    = 1
     autoid_bootstrap = 0
   }
 }
@@ -69,7 +75,7 @@ variable "instance_count" {
 variable "aws_region" {
   description = "aws region"
   type        = list(string)
-  default     = ["us-east-1"]
+  default     = ["us-west-2"]
 }
 
 variable "public_subnet_cidrs" {
diff --git a/templates/terraform/network-primitives/dns.tf b/templates/terraform/network-primitives/dns.tf
index d9f655f4..f6491b1a 100644
--- a/templates/terraform/network-primitives/dns.tf
+++ b/templates/terraform/network-primitives/dns.tf
@@ -29,7 +29,7 @@ resource "cloudflare_dns_record" "rpc" {
   name    = "${var.rpc-node-config.domain-prefix}-${count.index}.${var.network_name}"
   content = local.rpc_nodes_ip_v4[count.index]
   type    = "A"
-  ttl     = 3600
+  ttl     = 1
   proxied = true
 }
 
@@ -39,8 +39,8 @@ resource "cloudflare_dns_record" "auto_evm" {
   name     = "${var.domain-node-config.domain-prefix[0]}-${each.key}.${var.network_name}"
   content  = each.value.ip_v4
   type     = "A"
-  ttl      = 3600
-  proxied = true
+  ttl      = 1
+  proxied  = true
 }
 
 resource "cloudflare_dns_record" "auto_evm_ipv6" {
@@ -49,8 +49,8 @@ resource "cloudflare_dns_record" "auto_evm_ipv6" {
   name     = "${var.domain-node-config.domain-prefix[0]}-${each.key}.${var.network_name}"
   content  = each.value.ip_v6
   type     = "AAAA"
-  ttl      = 3600
-  proxied = true
+  ttl      = 1
+  proxied  = true
 }
 
 resource "cloudflare_dns_record" "rpc-indexer" {
@@ -79,8 +79,8 @@ resource "cloudflare_dns_record" "autoid" {
   name     = "${var.domain-node-config.domain-prefix[1]}-${each.key}.${var.network_name}"
   content  = each.value.ip_v4
   type     = "A"
-  ttl      = 3600
-  proxied = true
+  ttl      = 1
+  proxied  = true
 }
 
 resource "cloudflare_dns_record" "autoid_ipv6" {
@@ -89,8 +89,8 @@ resource "cloudflare_dns_record" "autoid_ipv6" {
   name     = "${var.domain-node-config.domain-prefix[1]}-${each.key}.${var.network_name}"
   content  = each.value.ip_v6
   type     = "AAAA"
-  ttl      = 3600
-  proxied = true
+  ttl      = 1
+  proxied  = true
 }
 
 resource "cloudflare_dns_record" "bootstrap" {
diff --git a/templates/terraform/network-primitives/instances.tf b/templates/terraform/network-primitives/instances.tf
index 3a111f15..ee626a41 100644
--- a/templates/terraform/network-primitives/instances.tf
+++ b/templates/terraform/network-primitives/instances.tf
@@ -37,7 +37,7 @@ resource "aws_instance" "bootstrap_node" {
 
   lifecycle {
 
-    ignore_changes = [ami, ipv6_address_count]
+    ignore_changes = [ami, ipv6_address_count, associate_public_ip_address]
 
   }
 
@@ -101,7 +101,7 @@ resource "aws_instance" "bootstrap_node_evm" {
 
   lifecycle {
 
-    ignore_changes = [ami, ipv6_address_count]
+    ignore_changes = [ami, ipv6_address_count, associate_public_ip_address]
 
   }
 
@@ -165,7 +165,7 @@ resource "aws_instance" "bootstrap_node_autoid" {
 
   lifecycle {
 
-    ignore_changes = [ami, ipv6_address_count]
+    ignore_changes = [ami, ipv6_address_count, associate_public_ip_address]
 
   }
 
@@ -228,7 +228,7 @@ resource "aws_instance" "rpc_indexer_node" {
 
   lifecycle {
 
-    ignore_changes = [ami, ipv6_address_count]
+    ignore_changes = [ami, ipv6_address_count, associate_public_ip_address]
 
   }
 
@@ -291,7 +291,7 @@ resource "aws_instance" "auto_evm_indexer_node" {
 
   lifecycle {
 
-    ignore_changes = [ami, ipv6_address_count]
+    ignore_changes = [ami, ipv6_address_count, associate_public_ip_address]
 
   }
 
@@ -353,7 +353,7 @@ resource "aws_instance" "rpc_node" {
 
   lifecycle {
 
-    ignore_changes = [ami, ipv6_address_count]
+    ignore_changes = [ami, ipv6_address_count, associate_public_ip_address]
 
   }
 
@@ -418,7 +418,7 @@ resource "aws_instance" "evm_node" {
 
   lifecycle {
 
-    ignore_changes = [ami, ipv6_address_count]
+    ignore_changes = [ami, ipv6_address_count, associate_public_ip_address]
 
   }
 
@@ -481,7 +481,7 @@ resource "aws_instance" "autoid_node" {
 
   lifecycle {
 
-    ignore_changes = [ami, ipv6_address_count]
+    ignore_changes = [ami, ipv6_address_count, associate_public_ip_address]
 
   }
 
@@ -543,7 +543,7 @@ resource "aws_instance" "farmer_node" {
 
   lifecycle {
 
-    ignore_changes = [ami, ipv6_address_count]
+    ignore_changes = [ami, ipv6_address_count, associate_public_ip_address]
 
   }