diff --git a/.github/issue_labeler.yml b/.github/issue_labeler.yml
new file mode 100644
index 0000000000..24025e9cc1
--- /dev/null
+++ b/.github/issue_labeler.yml
@@ -0,0 +1,64 @@
+bug:
+  - 'bug'
+  - 'error'
+  - 'issue'
+  - 'crash'
+  - 'panic'
+  - 'fail'
+  - 'broken'
+  - 'not work'
+  - 'exception'
+
+enhancement:
+  - 'feature'
+  - 'enhancement'
+  - 'improve'
+  - 'add'
+  - 'support'
+  - 'request'
+  - 'proposal'
+  - 'rfc'
+
+documentation:
+  - 'docs'
+  - 'documentation'
+  - 'readme'
+  - 'guide'
+  - 'tutorial'
+  - 'example'
+  - 'spec'
+  - 'specification'
+
+cli:
+  - 'cli'
+  - 'command'
+  - 'cronosd'
+  - 'flag'
+  - 'argument'
+  - 'terminal'
+
+cronos:
+  - 'cronos'
+
+e2ee:
+  - 'encryption'
+  - 'e2ee'
+
+dependencies:
+  - 'dependency'
+  - 'dependencies'
+  - 'go.mod'
+  - 'cosmos-sdk'
+  - 'tendermint'
+  - 'cometbft'
+
+build:
+  - 'build'
+  - 'compile'
+  - 'makefile'
+  - 'docker'
+
+ci:
+  - 'ci'
+  - 'github actions'
+  - 'workflow'
diff --git a/.github/pr_labeler.yml b/.github/pr_labeler.yml
index e6d8f04b07..4c5743ce58 100644
--- a/.github/pr_labeler.yml
+++ b/.github/pr_labeler.yml
@@ -1,29 +1,31 @@
-"cli":
+cli:
   - client/**/*
   - x/*/client/**/*
-"nix":
+nix:
   - nix/**
   - default.nix
   - docker.nix
   - flake.nix
-"simulation":
+simulation:
   - types/simulation/**/*
   - x/simulation/**/*
   - x/*/simulation/**/*
   - simsx/**/*
   - tools/benchmark/**/*
-"cronos":
-  - x/cronos/**/*
-"e2ee":
-  - x/e2ee/**/*
-"adr":
+adr:
   - docs/architecture/**/*
-"build":
+build:
   - Makefile
   - Dockerfile
   - docker-compose.yml
   - scripts/*
-"ci":
+ci:
   - .github/**
   - buf.work.yaml
   - .golangci.yml
+
+# modules
+cronos:
+  - x/cronos/**/*
+e2ee:
+  - x/e2ee/**/*
diff --git a/Makefile b/Makefile
index bc7c12618c..998801b210 100644
--- a/Makefile
+++ b/Makefile
@@ -139,7 +139,7 @@ lint:
 	golangci-lint run --output.text.path stdout --path-prefix=./
 
 lint-fix:
-	golangci-lint run --fix --output.text.path stdout --issues-exit-code=0
+	golangci-lint run --fix --issues-exit-code=0 --path-prefix=./
 
 lint-py:
 	flake8 --show-source --count --statistics \
diff --git a/go.mod b/go.mod
index 187bbc938c..bcd869c6b3 100644
--- a/go.mod
+++ b/go.mod
@@ -305,7 +305,7 @@ replace (
 	// release/v1.15
 	github.com/ethereum/go-ethereum => github.com/crypto-org-chain/go-ethereum v1.10.20-0.20250815065500-a4fbafcae0dd
 	// develop
-	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20250818090852-991f14f190f1
+	github.com/evmos/ethermint => github.com/crypto-org-chain/ethermint v0.6.1-0.20250819081101-9a03795ec96b
 	// Fix upstream GHSA-h395-qcrw-5vmq and GHSA-3vp4-m3rf-835h vulnerabilities.
 	// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
 	github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0
diff --git a/go.sum b/go.sum
index 0e3a796957..d4252b59a6 100644
--- a/go.sum
+++ b/go.sum
@@ -910,8 +910,8 @@ github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241217090828-cfbca9fe8254
 github.com/crypto-org-chain/cosmos-sdk/store v0.0.0-20241217090828-cfbca9fe8254/go.mod h1:8DwVTz83/2PSI366FERGbWSH7hL6sB7HbYp8bqksNwM=
 github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241217090828-cfbca9fe8254 h1:JzLOFRiKsDtLJt5h0M0jkEIPDKvFFyja7VEp7gG6O9U=
 github.com/crypto-org-chain/cosmos-sdk/x/tx v0.0.0-20241217090828-cfbca9fe8254/go.mod h1:V6DImnwJMTq5qFjeGWpXNiT/fjgE4HtmclRmTqRVM3w=
-github.com/crypto-org-chain/ethermint v0.6.1-0.20250818090852-991f14f190f1 h1:DSmzh/JMVZ5ayLYRGfbDywSCrUJcwyTcVRqzr36hgqg=
-github.com/crypto-org-chain/ethermint v0.6.1-0.20250818090852-991f14f190f1/go.mod h1:pilxRzYqGqlhVBDXcBYfDbFy6vkiqxwc8zHDPYXLnOQ=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20250819081101-9a03795ec96b h1:Tm6Hm2id0PRMc8LNQduNY3bA6nvEz/qXoAyTpnEHCHA=
+github.com/crypto-org-chain/ethermint v0.6.1-0.20250819081101-9a03795ec96b/go.mod h1:pilxRzYqGqlhVBDXcBYfDbFy6vkiqxwc8zHDPYXLnOQ=
 github.com/crypto-org-chain/go-block-stm v0.0.0-20241213061541-7afe924fb4a6 h1:6KPEi8dWkDSBddQb4NAvEXmNnTXymF3yVeTaT4Hz1iU=
 github.com/crypto-org-chain/go-block-stm v0.0.0-20241213061541-7afe924fb4a6/go.mod h1:iwQTX9xMX8NV9k3o2BiWXA0SswpsZrDk5q3gA7nWYiE=
 github.com/crypto-org-chain/go-ethereum v1.10.20-0.20250815065500-a4fbafcae0dd h1:ebSnzvM9yKVGFjvoGly7LFQQCS2HuOWMCvQyByJ52Gs=
diff --git a/gomod2nix.toml b/gomod2nix.toml
index 1d87a560ba..f1c3d0637f 100644
--- a/gomod2nix.toml
+++ b/gomod2nix.toml
@@ -314,8 +314,8 @@ schema = 3
     version = "v0.2.2"
     hash = "sha256-0MLfSJKdeK3Z7tWAXTdzwB4091dmyxIX38S5SKH5QAw="
   [mod."github.com/evmos/ethermint"]
-    version = "v0.6.1-0.20250818090852-991f14f190f1"
-    hash = "sha256-M2wsoNCNl97CD0JvYq9PLaR4Z3YJSLH2im5j2sL2E4A="
+    version = "v0.6.1-0.20250819081101-9a03795ec96b"
+    hash = "sha256-AbomdzYu7acbuQooMZwqe8vh08Q2jBYtRAMaZF3Yg+4="
     replaced = "github.com/crypto-org-chain/ethermint"
   [mod."github.com/fatih/color"]
     version = "v1.17.0"