diff --git a/build/bootstrap/butterflynet.pi b/build/bootstrap/butterflynet.pi
index ce71427d5..0bafdb593 100644
--- a/build/bootstrap/butterflynet.pi
+++ b/build/bootstrap/butterflynet.pi
@@ -1,2 +1,2 @@
-/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWMQBVoPirSWwrNr9QBj6RhGa48NGAeyr4cZvMMAzSEUZW
-/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWQ2Q1yhD799kSDcbjeb5mr4ZSCK2PsGa4gyBZemfgx1uT
+/dns4/bootstrap-0.butterfly.fildev.network/tcp/1347/p2p/12D3KooWF31bhPqjeAxNSCvWTLGq84iuMhKvbgK31rgTXfRjgByn
+/dns4/bootstrap-1.butterfly.fildev.network/tcp/1347/p2p/12D3KooWEY2LteCs2tYLmAWZ6U9eHzgnvmVsd5pSrKLg8nn3A6nh
diff --git a/build/genesis/butterflynet.car b/build/genesis/butterflynet.car
index dcc70f511..d933184d9 100644
Binary files a/build/genesis/butterflynet.car and b/build/genesis/butterflynet.car differ
diff --git a/build/params_2k.go b/build/params_2k.go
index a86f8a833..c3199e2d6 100644
--- a/build/params_2k.go
+++ b/build/params_2k.go
@@ -23,7 +23,7 @@ var NetworkBundle = "devnet"
 var BundleOverrides map[actorstypes.Version]string
 var ActorDebugging = true
 
-const GenesisNetworkVersion = network.Version17
+const GenesisNetworkVersion = network.Version18
 
 var UpgradeBreezeHeight = abi.ChainEpoch(-1)
 
@@ -61,9 +61,9 @@ var UpgradeSharkHeight = abi.ChainEpoch(-20)
 
 var UpgradeHyggeHeight = abi.ChainEpoch(-21)
 
-var UpgradeLightningHeight = 30
+var UpgradeLightningHeight = abi.ChainEpoch(30)
 
-var UpgradeThunderHeight = 1000
+var UpgradeThunderHeight = abi.ChainEpoch(1000)
 
 var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
diff --git a/build/params_butterfly.go b/build/params_butterfly.go
index 63ab9a706..137f42fb2 100644
--- a/build/params_butterfly.go
+++ b/build/params_butterfly.go
@@ -19,7 +19,7 @@ var DrandSchedule = map[abi.ChainEpoch]DrandEnum{
 	0: DrandMainnet,
 }
 
-const GenesisNetworkVersion = network.Version17
+const GenesisNetworkVersion = network.Version18
 
 var NetworkBundle = "butterflynet"
 var BundleOverrides map[actorstypes.Version]string
@@ -50,12 +50,12 @@ const UpgradeHyperdriveHeight = -16
 const UpgradeChocolateHeight = -17
 const UpgradeOhSnapHeight = -18
 const UpgradeSkyrHeight = -19
-const UpgradeSharkHeight = abi.ChainEpoch(-20)
-const UpgradeHyggeHeight = abi.ChainEpoch(-21)
+const UpgradeSharkHeight = -20
+const UpgradeHyggeHeight = -21
 
-const UpgradeLightningHeight = 600
+const UpgradeLightningHeight = 360
 
-const UpgradeThunderHeight = UpgradeLightningHeight + 1440
+const UpgradeThunderHeight = UpgradeLightningHeight + 360
 
 var SupportedProofTypes = []abi.RegisteredSealProof{
 	abi.RegisteredSealProof_StackedDrg512MiBV1,
diff --git a/chain/consensus/filcns/upgrades.go b/chain/consensus/filcns/upgrades.go
index c82ad6a5c..7b1461636 100644
--- a/chain/consensus/filcns/upgrades.go
+++ b/chain/consensus/filcns/upgrades.go
@@ -1778,9 +1778,9 @@ func upgradeActorsV11Common(
 		return cid.Undef, xerrors.Errorf("failed to decode state root: %w", err)
 	}
 
-	if stateRoot.Version != types.StateTreeVersion4 {
+	if stateRoot.Version != types.StateTreeVersion5 {
 		return cid.Undef, xerrors.Errorf(
-			"expected state root version 4 for actors v11 upgrade, got %d",
+			"expected state root version 5 for actors v11 upgrade, got %d",
 			stateRoot.Version,
 		)
 	}
@@ -1794,7 +1794,7 @@ func upgradeActorsV11Common(
 	newHamtRoot, err := nv19.MigrateStateTree(ctx, adtStore, manifest, stateRoot.Actors, epoch, config,
 		migrationLogger{}, cache)
 	if err != nil {
-		return cid.Undef, xerrors.Errorf("upgrading to actors v10: %w", err)
+		return cid.Undef, xerrors.Errorf("upgrading to actors v11: %w", err)
 	}
 
 	// Persist the result.