diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d656afc..6ade314 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,9 +24,9 @@ jobs:
     name: build ${{ matrix.arch }} for ${{ matrix.targetos }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Setup go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
           check-latest: true
@@ -43,9 +43,9 @@ jobs:
     runs-on: ubuntu-latest
     name: tidy
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Setup go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
       - run: |
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index c5b61d6..92b854d 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -24,25 +24,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Build and export
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v7
         with:
           context: .
           tags: tokenfactory:local
           outputs: type=docker,dest=${{ env.TAR_PATH }}
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ env.IMAGE_NAME }}
           path: ${{ env.TAR_PATH }}
@@ -58,16 +58,16 @@ jobs:
       fail-fast: false
 
     steps:
+      - name: checkout chain
+        uses: actions/checkout@v6
+
       - name: Set up Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
 
-      - name: checkout chain
-        uses: actions/checkout@v4
-
       - name: Download Tarball Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: ${{ env.IMAGE_NAME }}
           path: /tmp
@@ -84,14 +84,14 @@ jobs:
     needs: build-docker
     runs-on: ubuntu-latest
     steps:
-     - uses: actions/checkout@v4
+     - uses: actions/checkout@v6
 
-     - uses: actions/setup-go@v4
+     - uses: actions/setup-go@v6
        with:
          go-version: ${{ env.GO_VERSION }}
 
      - name: Download Host Artifact
-       uses: actions/download-artifact@v4
+       uses: actions/download-artifact@v7
        with:
          name: ${{ env.IMAGE_NAME }}
          path: /tmp
@@ -105,9 +105,9 @@ jobs:
        run: make coverage
 
      - name: Upload coverage to Codecov
-       uses: codecov/codecov-action@v4
+       uses: codecov/codecov-action@v6
        with:
-         file: /tmp/tokenfactory-coverage/coverage-merged-filtered.out
+         files: /tmp/tokenfactory-coverage/coverage-merged-filtered.out
          token: ${{ secrets.CODECOV_TOKEN }}
        env:
          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/simulator.yml b/.github/workflows/simulator.yml
index 0ce5aab..35a3db1 100644
--- a/.github/workflows/simulator.yml
+++ b/.github/workflows/simulator.yml
@@ -17,9 +17,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out source
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
           check-latest: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7adf4dd..3449c4d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,9 +18,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out source
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: ${{ env.GO_VERSION }}
           check-latest: true
diff --git a/Makefile b/Makefile
index bbaa029..96ffd6f 100644
--- a/Makefile
+++ b/Makefile
@@ -149,8 +149,10 @@ coverage: ## Run coverage report
 	@${COV_SIM_CMD} -test.run TestAppSimulationAfterImport ${COV_SIM_COMMON} > /dev/null 2>&1
 	@echo "  --> Running App State Determinism Simulation"
 	@${COV_SIM_CMD} -test.run TestAppStateDeterminism ${COV_SIM_COMMON} > /dev/null 2>&1
-	@echo "--> Running unit & e2e tests coverage"
-	@go test -timeout 60m -race -covermode=atomic -v -cpu=$(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1) -cover $(shell go list ./...) ./interchaintest/... -coverpkg=${COV_PKG} -args -test.gocoverdir="${COV_UNIT_E2E}" > /dev/null 2>&1
+	@echo "--> Running unit tests coverage"
+	@go test -timeout 30m -race -covermode=atomic -v -cpu=$(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1) -cover $(shell go list ./... | grep -v '/app$$') -coverpkg=${COV_PKG} -args -test.gocoverdir="${COV_UNIT_E2E}"
+	@echo "--> Running e2e tests coverage"
+	@go test -timeout 30m -race -covermode=atomic -v -cpu=$(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1) -cover ./interchaintest/... -coverpkg=${COV_PKG} -args -test.gocoverdir="${COV_UNIT_E2E}"
 	@echo "--> Merging coverage reports"
 	@go tool covdata merge -i=${COV_UNIT_E2E},${COV_SIMULATION} -o ${COV_ROOT}
 	@echo "--> Converting binary coverage report to text format"