diff --git a/.dockerignore b/.dockerignore
index c20344600..247cdacd9 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,5 @@
 temp/
 build/
-*.md
\ No newline at end of file
+*.md
+go-pkg
+**/go-pkg
\ No newline at end of file
diff --git a/.github/workflows/chaosnet-docker.yml b/.github/workflows/chaosnet-docker.yml
index 28aeb0585..5926f85ee 100644
--- a/.github/workflows/chaosnet-docker.yml
+++ b/.github/workflows/chaosnet-docker.yml
@@ -1,11 +1,11 @@
 name: Chaosnet Docker Image
 
-on:
-  push:
-    branches:
-      - main
-    tags:
-      - v*
+on: ["push"]
+#  push:
+#    branches:
+#      - main
+#    tags:
+#      - v*
 
 jobs:
   chaosnet:
@@ -39,7 +39,7 @@ jobs:
             go-build
             go-pkg
             nibiru-temp
-          key: ${{ runner.os }}-build-cache-${{ hashFiles('go.sum') }}
+          key: ${{ runner.os }}-chaosnet-build-cache-${{ hashFiles('go.sum') }}
 
       - name: Inject cache
         uses: reproducible-containers/buildkit-cache-dance@v3.1.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10705f8ae..391e68dbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#2207](https://github.com/NibiruChain/nibiru/pull/2207) - chore(ci): add cache for chaosnet builds
 - [#2209](https://github.com/NibiruChain/nibiru/pull/2209) - refator(ci):
 Simplify GitHub actions based on conditional paths, removing the need for files like ".github/workflows/skip-unit-tests.yml".
+- [#2211](https://github.com/NibiruChain/nibiru/pull/2211) - ci(chaosnet): avoid building on cache injected directories
 
 ## [v2.0.0-p1](https://github.com/NibiruChain/nibiru/releases/tag/v2.0.0-p1) - 2025-02-10
 
diff --git a/Dockerfile b/Dockerfile
index 0030a4823..b4f0f0c0a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,15 +3,12 @@ FROM golang:1.21 AS builder
 WORKDIR /nibiru
 
 # install OS dependencies
-COPY Makefile ./
-COPY contrib/ ./contrib
-RUN make packages
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    liblz4-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev
 
 # install Go dependencies
 COPY go.sum go.mod ./
-RUN --mount=type=cache,target=/root/.cache/go-build \
-  --mount=type=cache,target=/go/pkg \
-  go mod download
+RUN go mod download
 
 # build nibid
 COPY . .
diff --git a/contrib/docker/chaosnet.Dockerfile b/contrib/docker/chaosnet.Dockerfile
index 4fb8579b4..d3bbc774b 100644
--- a/contrib/docker/chaosnet.Dockerfile
+++ b/contrib/docker/chaosnet.Dockerfile
@@ -3,15 +3,12 @@ FROM golang:1.21 AS builder
 WORKDIR /nibiru
 
 # install OS dependencies
-COPY Makefile ./
-COPY contrib/ ./contrib
-RUN make packages
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    liblz4-dev libsnappy-dev zlib1g-dev libbz2-dev libzstd-dev
 
 # install Go dependencies
-COPY go.sum go.mod ./  
-RUN --mount=type=cache,target=/root/.cache/go-build \
-  --mount=type=cache,target=/go/pkg \
-  go mod download
+COPY go.sum go.mod ./
+RUN go mod download
 
 # build nibid
 COPY . .
diff --git a/contrib/make/build.mk b/contrib/make/build.mk
index 378acb617..ef84a6df7 100644
--- a/contrib/make/build.mk
+++ b/contrib/make/build.mk
@@ -125,7 +125,7 @@ packages:
 # command for make build and make install
 build: BUILDARGS=-o $(BUILDDIR)/
 build install: go.sum $(BUILDDIR)/ rocksdblib wasmvmlib packages
-	CGO_ENABLED=1 CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" go $@ -mod=readonly -trimpath $(BUILD_FLAGS) $(BUILDARGS) ./...
+	CGO_ENABLED=1 CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" go $@ -mod=readonly -trimpath $(BUILD_FLAGS) $(BUILDARGS) ./cmd/...
 
 # ensure build directory exists
 $(BUILDDIR)/:
diff --git a/contrib/make/release.mk b/contrib/make/release.mk
index 29f28cfd0..b6cfdd0ca 100644
--- a/contrib/make/release.mk
+++ b/contrib/make/release.mk
@@ -4,15 +4,15 @@
 
 PACKAGE_NAME		  := github.com/NibiruChain/nibiru
 GOLANG_CROSS_VERSION  ?= v1.21.5
-CMT_VERSION 		  := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::')
+CMT_VERSION 		  = $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::')
 
 DOCKER_YQ = docker run --rm -v $(PWD):/work -w /work mikefarah/yq:4
 
-DARWIN_TAGS := $(shell $(DOCKER_YQ) e \
+DARWIN_TAGS = $(shell $(DOCKER_YQ) e \
     '.builds | map(select(.id == "darwin")) | .[0].tags | join(",")' \
     .goreleaser.yml)
 
-LINUX_TAGS := $(shell $(DOCKER_YQ) e \
+LINUX_TAGS = $(shell $(DOCKER_YQ) e \
     '.builds | map(select(.id == "linux")) | .[0].tags | join(",")' \
     .goreleaser.yml)