diff --git a/.github/workflows/go-version.env b/.github/workflows/go-version.env
index 332e41f6435..20ad8974915 100644
--- a/.github/workflows/go-version.env
+++ b/.github/workflows/go-version.env
@@ -1,2 +1,2 @@
 # .github/workflows/go-version.env
-GO_VERSION=1.23
+GO_VERSION=1.24
diff --git a/api/go.mod b/api/go.mod
index 160ab2c65aa..f1e224e8b35 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -1,6 +1,6 @@
 module github.com/cometbft/cometbft/api
 
-go 1.23
+go 1.24
 
 require (
 	github.com/cosmos/gogoproto v1.4.12
diff --git a/go.mod b/go.mod
index 3a2dfedff77..feb186e1c79 100644
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,6 @@
 module github.com/cometbft/cometbft
 
-go 1.23
-toolchain go1.23.7
+go 1.24
 
 require (
 	github.com/BurntSushi/toml v1.4.0
@@ -144,6 +143,8 @@ require (
 	gotest.tools v2.2.0+incompatible // indirect
 )
 
+replace github.com/cometbft/cometbft/api => ./api
+
 retract (
 	// a regression was introduced
 	v0.38.4
diff --git a/go.sum b/go.sum
index 141701e448f..32b6f4758f8 100644
--- a/go.sum
+++ b/go.sum
@@ -76,8 +76,6 @@ github.com/cometbft/cometbft-db v1.0.4 h1:cezb8yx/ZWcF124wqUtAFjAuDksS1y1yXedvtp
 github.com/cometbft/cometbft-db v1.0.4/go.mod h1:M+BtHAGU2XLrpUxo3Nn1nOCcnVCiLM9yx5OuT0u5SCA=
 github.com/cometbft/cometbft-load-test v0.3.0 h1:z6iZZvFwhci29ca/EZQaWh/d92NLe8bK4eBvFyv2EKY=
 github.com/cometbft/cometbft-load-test v0.3.0/go.mod h1:zKrQpRm3Ay5+RfeRTNWoLniFJNIPnw9JPEM1wuWS3TA=
-github.com/cometbft/cometbft/api v1.0.0 h1:gGBwvsJi/gnHJEtwYfjPIGs2AKg/Vfa1ZuKCPD1/Ko4=
-github.com/cometbft/cometbft/api v1.0.0/go.mod h1:EkQiqVSu/p2ebrZEnB2z6Re7r8XNe//M7ylR0qEwWm0=
 github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
 github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM=
 github.com/cosmos/gogoproto v1.7.0 h1:79USr0oyXAbxg3rspGh/m4SWNyoz/GLaAh0QlCe2fro=
diff --git a/go.work b/go.work
index c44012091f6..4cddab53b02 100644
--- a/go.work
+++ b/go.work
@@ -1,4 +1,4 @@
-go 1.23
+go 1.24
 
 use (
 	.
diff --git a/mempool/clist_mempool.go b/mempool/clist_mempool.go
index a34621fed9a..6798199b780 100644
--- a/mempool/clist_mempool.go
+++ b/mempool/clist_mempool.go
@@ -407,7 +407,7 @@ func (mem *CListMempool) handleCheckTxResponse(tx types.Tx, sender p2p.ID) func(
 		}
 
 		var postCheckErr error
-		if mem.postCheck != nil {
+		if mem.postCheck != nil && res.Code == abci.CodeTypeOK {
 			postCheckErr = mem.postCheck(tx, res)
 		}
 
diff --git a/test/e2e/docker/Dockerfile b/test/e2e/docker/Dockerfile
index f072ac3b865..76bf8882065 100644
--- a/test/e2e/docker/Dockerfile
+++ b/test/e2e/docker/Dockerfile
@@ -1,7 +1,7 @@
 # We need to build in a Linux environment to support C libraries, e.g. RocksDB.
 # We use Debian instead of Alpine, so that we can use binary database packages
 # instead of spending time compiling them.
-FROM cometbft/cometbft-db-testing:v1.0.2
+FROM injectivelabs/cometbft-db-testing:v1.0.4-inj
 
 RUN apt-get -qq update -y && apt-get -qq upgrade -y >/dev/null
 
diff --git a/test/e2e/docker/Dockerfile.debug b/test/e2e/docker/Dockerfile.debug
index e71f2fb4ed5..a5a1e293d68 100644
--- a/test/e2e/docker/Dockerfile.debug
+++ b/test/e2e/docker/Dockerfile.debug
@@ -1,7 +1,7 @@
 # We need to build in a Linux environment to support C libraries, e.g. RocksDB.
 # We use Debian instead of Alpine, so that we can use binary database packages
 # instead of spending time compiling them.
-FROM cometbft/cometbft-db-testing:v1.0.2
+FROM injectivelabs/cometbft-db-testing:v1.0.4-inj
 
 RUN apt-get -qq update -y && apt-get -qq upgrade -y >/dev/null
 RUN apt-get -qq install -y zsh vim >/dev/null