diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index fdf7e8e2c..6b7d5f523 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -18,7 +18,7 @@ permissions: read-all
 jobs:
   analyze:
     name: Analyze
-    runs-on: depot-ubuntu-24.04-8
+    runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: read
diff --git a/.github/workflows/jsonrpc-compatibility.yml b/.github/workflows/jsonrpc-compatibility.yml
index 3d2b63239..832e0a84b 100644
--- a/.github/workflows/jsonrpc-compatibility.yml
+++ b/.github/workflows/jsonrpc-compatibility.yml
@@ -28,7 +28,7 @@ jobs:
     if: ${{ !startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main' }}
 
   jsonrpc-compatibility-test:
-    runs-on: depot-ubuntu-22.04-8
+    runs-on: ubuntu-latest
     timeout-minutes: 45
     steps:
       - uses: actions/setup-go@v5
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f53336477..54e903b43 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,8 +16,8 @@ permissions: read-all
 jobs:
   golangci:
     name: Run golangci-lint
-    runs-on: depot-ubuntu-24.04-8
-    timeout-minutes: 15
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
       - uses: actions/setup-go@v5
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5b7d7e006..b9b55dc4f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
     if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
 
   test-unit-cover:
-    runs-on: depot-ubuntu-24.04-16
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-go@v5
         with:
@@ -76,7 +76,7 @@ jobs:
         if: env.GIT_DIFF
 
   test-fuzz:
-    runs-on: depot-ubuntu-24.04-4
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-go@v5
         with:
diff --git a/Makefile b/Makefile
index 54e7bf9f4..d59ba1a75 100644
--- a/Makefile
+++ b/Makefile
@@ -132,12 +132,12 @@ PACKAGES_UNIT := $(shell go list ./... | grep -v '/tests/e2e$$' | grep -v '/simu
 PACKAGES_EVMD := $(shell cd evmd && go list ./... | grep -v '/simulation')
 COVERPKG_EVM  := $(shell go list ./... | grep -v '/tests/e2e$$' | grep -v '/simulation' | paste -sd, -)
 COVERPKG_ALL  := $(COVERPKG_EVM)
-COMMON_COVER_ARGS := -timeout=15m -covermode=atomic
+COMMON_COVER_ARGS := -timeout=30m -covermode=atomic
 
 TEST_PACKAGES := ./...
 TEST_TARGETS := test-unit test-evmd test-unit-cover test-race
 
-test-unit: ARGS=-timeout=15m
+test-unit: ARGS=-timeout=30m
 test-unit: TEST_PACKAGES=$(PACKAGES_UNIT)
 test-unit: run-tests
 
@@ -145,11 +145,11 @@ test-race: ARGS=-race
 test-race: TEST_PACKAGES=$(PACKAGES_UNIT)
 test-race: run-tests
 
-test-evmd: ARGS=-timeout=15m
+test-evmd: ARGS=-timeout=30m
 test-evmd:
 	@cd evmd && go test -race -tags=test -mod=readonly $(ARGS) $(EXTRA_ARGS) $(PACKAGES_EVMD)
 
-test-unit-cover: ARGS=-timeout=15m -coverprofile=coverage.txt -covermode=atomic
+test-unit-cover: ARGS=-timeout=30m -coverprofile=coverage.txt -covermode=atomic
 test-unit-cover: TEST_PACKAGES=$(PACKAGES_UNIT)
 test-unit-cover: run-tests
 	@echo "🔍 Running evm (root) coverage..."
@@ -167,9 +167,9 @@ test: test-unit
 
 test-all:
 	@echo "🔍 Running evm module tests..."
-	@go test -race -tags=test -mod=readonly -timeout=15m $(PACKAGES_NOSIMULATION)
+	@go test -race -tags=test -mod=readonly -timeout=30m $(PACKAGES_NOSIMULATION)
 	@echo "🔍 Running evmd module tests..."
-	@cd evmd && go test -race -tags=test -mod=readonly -timeout=15m $(PACKAGES_EVMD)
+	@cd evmd && go test -race -tags=test -mod=readonly -timeout=30m $(PACKAGES_EVMD)
 
 run-tests:
 ifneq (,$(shell which tparse 2>/dev/null))
@@ -216,7 +216,7 @@ lint: lint-go lint-python lint-contracts
 lint-go:
 	@echo "--> Running linter"
 	@go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(golangci_version)
-	@$(golangci_lint_cmd) run --timeout=15m
+	@$(golangci_lint_cmd) run --timeout=30m
 
 lint-python:
 	find . -name "*.py" -type f -not -path "*/node_modules/*" | xargs pylint
@@ -227,7 +227,7 @@ lint-contracts:
 
 lint-fix:
 	@go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$(golangci_version)
-	@$(golangci_lint_cmd) run --timeout=15m --fix
+	@$(golangci_lint_cmd) run --timeout=30m --fix
 
 lint-fix-contracts:
 	solhint --fix contracts/**/*.sol