diff --git a/.golangci.yml b/.golangci.yml
index 86008882..244ce91e 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -60,6 +60,7 @@ linters-settings:
     excludes:
       - G404
       - G101
+      - G601
   gocritic:
     disabled-checks:
       - appendAssign
diff --git a/app/app.go b/app/app.go
index 784bfe58..a7bf7230 100644
--- a/app/app.go
+++ b/app/app.go
@@ -356,7 +356,7 @@ func (app *OmniFlixApp) RegisterNodeService(clientCtx client.Context) {
 
 func (app *OmniFlixApp) setupUpgradeHandlers() {
 	for _, upgrade := range Upgrades {
-		app.AppKeepers.UpgradeKeeper.SetUpgradeHandler(
+		app.UpgradeKeeper.SetUpgradeHandler(
 			upgrade.UpgradeName,
 			upgrade.CreateUpgradeHandler(
 				app.mm,
diff --git a/app/upgrades/v2/upgrades.go b/app/upgrades/v2/upgrades.go
index 3ccf5e85..f744ff8a 100644
--- a/app/upgrades/v2/upgrades.go
+++ b/app/upgrades/v2/upgrades.go
@@ -48,7 +48,7 @@ func CreateV2UpgradeHandler(
 			case banktypes.ModuleName:
 				keyTable = banktypes.ParamKeyTable() //nolint:staticcheck
 			case stakingtypes.ModuleName:
-				keyTable = stakingtypes.ParamKeyTable() //nolint:staticcheck
+				keyTable = stakingtypes.ParamKeyTable()
 			case minttypes.ModuleName:
 				keyTable = minttypes.ParamKeyTable() //nolint:staticcheck
 			case distrtypes.ModuleName: