diff --git a/op-deployer/pkg/deployer/integration_test/apply_test.go b/op-deployer/pkg/deployer/integration_test/apply_test.go
index cefade057cc..25383547f2a 100644
--- a/op-deployer/pkg/deployer/integration_test/apply_test.go
+++ b/op-deployer/pkg/deployer/integration_test/apply_test.go
@@ -174,8 +174,6 @@ func TestEndToEndBootstrapApplyWithUpgrade(t *testing.T) {
 		devFeature common.Hash
 	}{
 		{"default", common.Hash{}},
-		{"deploy-v2-disputegames", deployer.DeployV2DisputeGamesDevFlag},
-		{"cannon-kona", deployer.EnableDevFeature(deployer.DeployV2DisputeGamesDevFlag, deployer.CannonKonaDevFlag)},
 		{"opcm-v2", deployer.OpcmV2DevFlag},
 	}
 	for _, tt := range tests {
@@ -916,26 +914,6 @@ func runEndToEndBootstrapAndApplyUpgradeTest(t *testing.T, afactsFS foundry.Stat
 	})
 }
 
-func mustEncodeGameArgs(absolutePrestate common.Hash, proposer, challenger common.Address) []byte {
-	// Use Ethereum ABI encoding for the game args
-	// In Solidity, abi.encode(MyStruct{...}) encodes the struct fields as a tuple
-	// For FaultDisputeGameConfig: abi.encode((bytes32)) = 32 bytes
-	// For PermissionedDisputeGameConfig: abi.encode((bytes32,address,address)) = 96 bytes (3 * 32)
-
-	if proposer == (common.Address{}) {
-		// FaultDisputeGameConfig: abi.encode((bytes32 absolutePrestate))
-		// This is just the raw bytes32 value (32 bytes)
-		return absolutePrestate[:]
-	}
-	// PermissionedDisputeGameConfig: abi.encode((bytes32,address,address))
-	// This is 96 bytes: bytes32 + address (left-padded to 32) + address (left-padded to 32)
-	result := make([]byte, 96)
-	copy(result[0:32], absolutePrestate[:])
-	copy(result[44:64], proposer[:])   // address at offset 32, left-padded (12 zero bytes + 20 address bytes)
-	copy(result[76:96], challenger[:]) // address at offset 64, left-padded (12 zero bytes + 20 address bytes)
-	return result
-}
-
 func needsSuperchainConfigUpgrade(
 	ctx context.Context,
 	client *ethclient.Client,
diff --git a/op-deployer/pkg/deployer/upgrade/v6_0_0/testdata/config.json b/op-deployer/pkg/deployer/upgrade/v7_0_0/testdata/config.json
similarity index 100%
rename from op-deployer/pkg/deployer/upgrade/v6_0_0/testdata/config.json
rename to op-deployer/pkg/deployer/upgrade/v7_0_0/testdata/config.json
diff --git a/op-deployer/pkg/deployer/upgrade/v6_0_0/upgrade.go b/op-deployer/pkg/deployer/upgrade/v7_0_0/upgrade.go
similarity index 96%
rename from op-deployer/pkg/deployer/upgrade/v6_0_0/upgrade.go
rename to op-deployer/pkg/deployer/upgrade/v7_0_0/upgrade.go
index 681e9370b7b..9e4b849f2bc 100644
--- a/op-deployer/pkg/deployer/upgrade/v6_0_0/upgrade.go
+++ b/op-deployer/pkg/deployer/upgrade/v7_0_0/upgrade.go
@@ -1,4 +1,4 @@
-package v6_0_0
+package v7_0_0
 
 import (
 	"encoding/json"
@@ -97,7 +97,7 @@ func Upgrade(host *script.Host, input UpgradeOPChainInput) error {
 	// We need to check which of the two versions of the input we are using.
 	var encodedUpgradeInput []byte
 	var encodedError error
-	if input.UpgradeInputV2 == nil && input.ChainConfigs == nil {
+	if input.UpgradeInputV2 == nil && len(input.ChainConfigs) == 0 {
 		return fmt.Errorf("failed to read either an upgrade input or config array")
 	} else if input.UpgradeInputV2 != nil {
 		encodedUpgradeInput, encodedError = input.EncodedUpgradeInputV2()
@@ -128,7 +128,7 @@ func (u *Upgrader) Upgrade(host *script.Host, input json.RawMessage) error {
 }
 
 func (u *Upgrader) ArtifactsURL() string {
-	// TODO: Add an actual resource locator that points to this set of artifacts.
+	// TODO(#18633): Add an actual resource locator that points to this set of artifacts.
 	return artifacts.CreateHttpLocator("")
 }
 
diff --git a/op-deployer/pkg/deployer/upgrade/v6_0_0/upgrade_test.go b/op-deployer/pkg/deployer/upgrade/v7_0_0/upgrade_test.go
similarity index 99%
rename from op-deployer/pkg/deployer/upgrade/v6_0_0/upgrade_test.go
rename to op-deployer/pkg/deployer/upgrade/v7_0_0/upgrade_test.go
index 869339e0120..560db6e67e6 100644
--- a/op-deployer/pkg/deployer/upgrade/v6_0_0/upgrade_test.go
+++ b/op-deployer/pkg/deployer/upgrade/v7_0_0/upgrade_test.go
@@ -1,4 +1,4 @@
-package v6_0_0
+package v7_0_0
 
 import (
 	"encoding/hex"