diff --git a/.github/actions/setup-ubuntu/action.yaml b/.github/actions/setup-ubuntu/action.yaml
index e93cc77f7..8182298ca 100644
--- a/.github/actions/setup-ubuntu/action.yaml
+++ b/.github/actions/setup-ubuntu/action.yaml
@@ -1,5 +1,10 @@
 ---
 name: setup-ubuntu
+inputs:
+  go-cache:
+    description: 'Enable actions/setup-go module cache restore/save. Disable on self-hosted runners where the module cache persists on disk.'
+    required: false
+    default: 'false'
 runs:
   using: 'composite'
   steps:
@@ -33,7 +38,7 @@ runs:
     - uses: actions/setup-go@v5
       with:
         go-version: "${{ env.GOVERSION }}"
-        check-latest: true
+        cache: "${{ inputs.go-cache }}"
     - name: set environment
       uses: HatsuneMiku3939/direnv-action@v1
       with:
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index e767a4be5..7e7fa9387 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -16,8 +16,12 @@ on:
 
 jobs:
   build-bins:
-    runs-on: ubuntu-latest
+    runs-on: core-runner
     steps:
+      - name: Cleanup build folder
+        run: |
+          sudo rm -rf ./* || true
+          sudo rm -rf ./.??* || true
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Free Disk Space (Ubuntu)
@@ -40,8 +44,12 @@ jobs:
       - run: make docker-image
 
   tests:
-    runs-on: ubuntu-latest
+    runs-on: core-runner
     steps:
+      - name: Cleanup build folder
+        run: |
+          sudo rm -rf ./* || true
+          sudo rm -rf ./.??* || true
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Setup environment
@@ -97,7 +105,7 @@ jobs:
         run: make test-sim-fullapp
 
   release-dry-run:
-    runs-on: core-e2e
+    runs-on: core-runner
     steps:
       - name: Cleanup build folder
         run: |
@@ -105,6 +113,11 @@ jobs:
           sudo rm -rf ./.??* || true
       - name: Checkout code
         uses: actions/checkout@v4
+      - name: Cache wasmvm libs
+        uses: actions/cache@v4
+        with:
+          path: .cache/lib
+          key: wasmvm-${{ hashFiles('go.sum') }}
       - name: Setup environment
         uses: ./.github/actions/setup-ubuntu
       - name: Set up QEMU
diff --git a/app/config.go b/app/config.go
index 3784d9fc4..59b675574 100644
--- a/app/config.go
+++ b/app/config.go
@@ -29,7 +29,7 @@ import (
 
 var mbasics = module.NewBasicManager(
 	append([]module.AppModuleBasic{
-		// accounts, fees.
+		//  accounts, fees.
 		auth.AppModuleBasic{},
 		// authorizations
 		authzmodule.AppModuleBasic{},
diff --git a/x/deployment/keeper/grpc_query.go b/x/deployment/keeper/grpc_query.go
index 8a1b2d051..1217b0964 100644
--- a/x/deployment/keeper/grpc_query.go
+++ b/x/deployment/keeper/grpc_query.go
@@ -430,7 +430,7 @@ func (k Querier) Params(ctx context.Context, req *types.QueryParamsRequest) (*ty
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
 	params, err := k.GetParams(sdkCtx)
 	if err != nil {
-		return nil, status.Errorf(codes.NotFound, err.Error())
+		return nil, status.Error(codes.NotFound, err.Error())
 	}
 
 	return &types.QueryParamsResponse{Params: params}, nil
diff --git a/x/market/keeper/grpc_query.go b/x/market/keeper/grpc_query.go
index aafc3f0b7..0a595164f 100644
--- a/x/market/keeper/grpc_query.go
+++ b/x/market/keeper/grpc_query.go
@@ -1167,7 +1167,7 @@ func (k Querier) Params(ctx context.Context, req *types.QueryParamsRequest) (*ty
 	sdkCtx := sdk.UnwrapSDKContext(ctx)
 	params, err := k.GetParams(sdkCtx)
 	if err != nil {
-		return nil, status.Errorf(codes.NotFound, err.Error())
+		return nil, status.Error(codes.NotFound, err.Error())
 	}
 
 	return &types.QueryParamsResponse{Params: params}, nil