diff --git a/.hmy/wallet.ini b/.hmy/wallet.ini
index d3be5901b..ba7fd59ef 100644
--- a/.hmy/wallet.ini
+++ b/.hmy/wallet.ini
@@ -30,19 +30,20 @@ rpc = 127.0.0.1:14556
 [devnet]
 bootnode = /ip4/100.26.90.187/tcp/9871/p2p/Qmdfjtk6hPoyrH1zVD9PEH4zfWLo38dP2mDvvKXfh3tnEv
 bootnode = /ip4/54.213.43.194/tcp/9871/p2p/QmRVbTpEYup8dSaURZfF6ByrMTSKa4UyUzJhSjahFzRqNj
-shards = 3
+shards = 4
 
 [devnet.shard0.rpc]
-rpc = 13.57.196.136:14555
-rpc = 35.175.103.144:14555
-rpc = 54.245.176.36:14555
+rpc = l0.t1.hmny.io:14555
+rpc = s0.t1.hmny.io:14555
 
 [devnet.shard1.rpc]
-rpc = 35.163.188.234:14555
-rpc = 54.215.251.123:14555
-rpc = 54.153.11.146:14555
+rpc = l1.t1.hmny.io:14555
+rpc = s1.t1.hmny.io:14555
 
 [devnet.shard2.rpc]
-rpc = 52.201.246.212:14555
-rpc = 3.81.26.139:14555
-rpc = 18.237.42.209:14555
+rpc = l2.t1.hmny.io:14555
+rpc = s2.t1.hmny.io:14555
+
+[devnet.shard3.rpc]
+rpc = l3.t1.hmny.io:14555
+rpc = s3.t1.hmny.io:14555
diff --git a/cmd/client/wallet/generated_wallet.ini.go b/cmd/client/wallet/generated_wallet.ini.go
index c50bbe348..786bfb8eb 100644
--- a/cmd/client/wallet/generated_wallet.ini.go
+++ b/cmd/client/wallet/generated_wallet.ini.go
@@ -33,21 +33,22 @@ rpc = 127.0.0.1:14556
 [devnet]
 bootnode = /ip4/100.26.90.187/tcp/9871/p2p/Qmdfjtk6hPoyrH1zVD9PEH4zfWLo38dP2mDvvKXfh3tnEv
 bootnode = /ip4/54.213.43.194/tcp/9871/p2p/QmRVbTpEYup8dSaURZfF6ByrMTSKa4UyUzJhSjahFzRqNj
-shards = 3
+shards = 4
 
 [devnet.shard0.rpc]
-rpc = 13.57.196.136:14555
-rpc = 35.175.103.144:14555
-rpc = 54.245.176.36:14555
+rpc = l0.t1.hmny.io:14555
+rpc = s0.t1.hmny.io:14555
 
 [devnet.shard1.rpc]
-rpc = 35.163.188.234:14555
-rpc = 54.215.251.123:14555
-rpc = 54.153.11.146:14555
+rpc = l1.t1.hmny.io:14555
+rpc = s1.t1.hmny.io:14555
 
 [devnet.shard2.rpc]
-rpc = 52.201.246.212:14555
-rpc = 3.81.26.139:14555
-rpc = 18.237.42.209:14555
+rpc = l2.t1.hmny.io:14555
+rpc = s2.t1.hmny.io:14555
+
+[devnet.shard3.rpc]
+rpc = l3.t1.hmny.io:14555
+rpc = s3.t1.hmny.io:14555
 `
 )
diff --git a/core/resharding.go b/core/resharding.go
index 6179cd99e..587c6901b 100644
--- a/core/resharding.go
+++ b/core/resharding.go
@@ -27,7 +27,7 @@ const (
 	// GenesisShardSize is the size of each shard at genesis
 	GenesisShardSize = 100
 	// GenesisShardHarmonyNodes is the number of harmony node at each shard
-	GenesisShardHarmonyNodes = 78
+	GenesisShardHarmonyNodes = 76
 	// CuckooRate is the percentage of nodes getting reshuffled in the second step of cuckoo resharding.
 	CuckooRate = 0.1
 )
diff --git a/internal/genesis/foundational.go b/internal/genesis/foundational.go
index a800ff05a..bba87b63e 100644
--- a/internal/genesis/foundational.go
+++ b/internal/genesis/foundational.go
@@ -2,9 +2,6 @@ package genesis
 
 // GenesisFNAccounts are the ECSDA accounts for the foundational nodes.
 var GenesisFNAccounts = [...]DeployAccount{
-	{Address: "0x35D29200aFC9A4cDC05166096059a042078CB53e", BlsPriKey: "af96cd1118284a8a5916359b7fa566346f2017eadc0d3efcaf67cffe374bf724"},
-	{Address: "0xe4a69826534aD3f6ec6E432474B0380E7F9a9C3d", BlsPriKey: "77da1ed33a8b00b2a227902f53045ed15aa2af735cb17ddbe5d42bcb29cda363"},
-
 	// 0 - 9
 	{Address: "0x04c3636dF766ad2d3E74424c016842f5704FAE3A", BlsPriKey: "ff889b96e38934c08ea158ce32fb94ec605180a4f665ed378aea9b9ac1c39320"},
 	{Address: "0x053515CC2CAae77F7e2F0A9C48A27c8f6D76E99d", BlsPriKey: "aedc22d8d56a316ae67b05605deaa4981cdd0cd1aacbe5b7a0bf1b7caa23146d"},
@@ -111,4 +108,13 @@ var GenesisFNAccounts = [...]DeployAccount{
 	{Address: "0xf10f63f5Bd46c58d2e9530E7F8cb6b4336D05d4E", BlsPriKey: "46bb0a5c47db2c94a456fd07690543db3f50710513814655d5eef13443a3b122"},
 	{Address: "0xfB81EFd254Fe117047872146806153539F89669E", BlsPriKey: "107062c37224ef8123653a1f3c92e3ceb76e9f6c346808c71bdb165848c47f28"},
 	{Address: "0xfdc963E875Ea99E434e4B815b7d8Bf506dAA9222", BlsPriKey: "4a75d92d2b0ec874bd3c8fdf8fd46ecc0ab18aa31581c013acc6a25b610f2c68"},
+	{Address: "0x35D29200aFC9A4cDC05166096059a042078CB53e", BlsPriKey: "af96cd1118284a8a5916359b7fa566346f2017eadc0d3efcaf67cffe374bf724"},
+
+	// 90 - 99
+	{Address: "0xe4a69826534aD3f6ec6E432474B0380E7F9a9C3d", BlsPriKey: "77da1ed33a8b00b2a227902f53045ed15aa2af735cb17ddbe5d42bcb29cda363"},
+	{Address: "0x74e0014c9899c82f05F6AC110583F9f7dCC36508", BlsPriKey: "49decb0f0d35ab8882b253a130f987a6d8dc8ee63b1df340c5ac953d68362790"},
+	{Address: "0x5a22c7ec1579C0d87760F4C8ec32fBE24d40E1Dc", BlsPriKey: "4fc4c886c8c5ae820848c6be9c9eafe1012f69cefc17aa790f4ce9daaf0cfae0"},
+	{Address: "0xcb0A6c1914d2AD10855cC8cD70B040b7Dc6573a8", BlsPriKey: "51b5dce64da6a543fd171f2a1309347792767e1258c4cb4a9594311a162b9fb6"},
+	{Address: "0xfF86Ff1FF457c3eBc18D71ffA30cfedd0860559c", BlsPriKey: "4b0d338b30a055bee3e2f070adc93d341b9316a315b4b4efe1639f0be2c1c10b"},
+	{Address: "0xff1bE0eAC9B6053CD656947F0CcE7d277FF720Ec", BlsPriKey: "d94e179e77a8bf71206b2232eb826a9b5f8a64c55d919411263511e3a2ce7407"},
 }
diff --git a/internal/utils/flags.go b/internal/utils/flags.go
index 491cd5900..0f8d4ec9d 100644
--- a/internal/utils/flags.go
+++ b/internal/utils/flags.go
@@ -66,8 +66,7 @@ func StringsToPeers(input string) []p2p.Peer {
 
 // DefaultBootNodeAddrStrings is a list of Harmony bootnodes address. Used to find other peers in the network.
 var DefaultBootNodeAddrStrings = []string{
-	// FIXME: (leo) this is a bootnode I used for local test, change it to long running ones later
-	"/ip4/127.0.0.1/tcp/9876/p2p/QmayB8NwxmfGE4Usb4H61M8uwbfc7LRbmXb3ChseJgbVuf",
+	"/ip4/127.0.0.1/tcp/19876/p2p/Qmc1V6W7BwX8Ugb42Ti8RnXF1rY5PF7nnZ6bKBryCgi6cv",
 }
 
 // BootNodes is a list of boot nodes. It is populated either from default or from user CLI input.