diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f78b61a5..2b150a81 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -7,13 +7,20 @@ on:
       - master
       - main
   pull_request:
+    paths:
+      - '**.go'
+
 env:
-  GO_VERSION: '1.20.5'
+  GO_VERSION: '1.20.0'
 
 permissions:
   contents: read
   # Optional: allow read access to pull request. Use with `only-new-issues` option.
   # pull-requests: read
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   golangci:
     name: lint
@@ -27,4 +34,4 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           version: latest
-          args: --timeout 5m0s
+          args: --timeout 10m
diff --git a/.golangci.yml b/.golangci.yml
index 4d6f0cf2..86008882 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -59,6 +59,7 @@ linters-settings:
   gosec:
     excludes:
       - G404
+      - G101
   gocritic:
     disabled-checks:
       - appendAssign
diff --git a/app/app.go b/app/app.go
index a7bf7230..784bfe58 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.UpgradeKeeper.SetUpgradeHandler(
+		app.AppKeepers.UpgradeKeeper.SetUpgradeHandler(
 			upgrade.UpgradeName,
 			upgrade.CreateUpgradeHandler(
 				app.mm,