diff --git a/.gitignore b/.gitignore
index eb745f7e..f8fb3c97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,7 @@ github.com/
 
 # Local docker volume mappings
 localnet-setup
-.testnets
+.testnets*
 
 # Testing
 coverage.txt
diff --git a/Makefile b/Makefile
index b5edd0bf..2f559589 100644
--- a/Makefile
+++ b/Makefile
@@ -215,9 +215,14 @@ proto-check-breaking:
 localnet-build-env:
 	$(MAKE) -C contrib/images lorenzod-env
 
-localnet-build-nodes:
+localnet-build-dev:
+	$(MAKE) -C contrib/images lorenzod-dev
+
+localnet-init:
 	$(DOCKER) run --rm -v $(CURDIR)/.testnets:/data lorenzo/lorenzod \
 			  testnet init-files --v 4 -o /data --starting-ip-address 192.168.10.2 --keyring-backend=test
+
+localnet-start:
 	docker-compose up -d
 
 localnet-stop:
diff --git a/app/upgrade.go b/app/upgrade.go
index bb343f32..1a4981a1 100644
--- a/app/upgrade.go
+++ b/app/upgrade.go
@@ -32,6 +32,11 @@ func (app *LorenzoApp) appKeepers() upgrades.AppKeepers {
 		EvmKeeper:       app.EvmKeeper,
 		FeeMarketKeeper: app.FeeMarketKeeper,
 		ReaderWriter:    app,
+
+		BTCStakingKeeper: &app.BTCStakingKeeper,
+		AgentKeeper:      &app.AgentKeeper,
+		PlanKeeper:       app.PlanKeeper,
+		TokenKeeper:      app.TokenKeeper,
 	}
 }
 
diff --git a/app/upgrades/types.go b/app/upgrades/types.go
index 4a7c922b..91fe2b08 100644
--- a/app/upgrades/types.go
+++ b/app/upgrades/types.go
@@ -48,10 +48,11 @@ type AppKeepers struct {
 	IBCKeeper        *ibckeeper.Keeper
 	EvmKeeper        *evmkeeper.Keeper
 	FeeMarketKeeper  feemarketkeeper.Keeper
-	AgentKeeper      agentkeeper.Keeper
-	PlanKeeper       *plankeeper.Keeper
-	BTCStakingKeeper btcstakingkeeper.Keeper
-	TokenKeeper      *tokenkeeper.Keeper
+	BTCStakingKeeper *btcstakingkeeper.Keeper
+
+	AgentKeeper *agentkeeper.Keeper
+	PlanKeeper  *plankeeper.Keeper
+	TokenKeeper *tokenkeeper.Keeper
 
 	ReaderWriter ConsensusParamsReaderWriter
 }