diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index b8cf7f75e0dd..50c9fe7f7511 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -34,6 +34,47 @@ jobs:
         go run build/ci.go check_generate
         go run build/ci.go check_baddeps
 
+  keeper:
+    name: Keeper Builds
+    needs: test
+    runs-on: [self-hosted-ghr, size-l-x64]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.25'
+          cache: false
+
+      - name: Build
+        run: go run build/ci.go keeper
+
+  test-32bit:
+    name: "32bit tests"
+    needs: test
+    runs-on: [self-hosted-ghr, size-l-x64]
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: false
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.25'
+          cache: false
+
+      - name: Install cross toolchain
+        run: |
+          apt-get update
+          apt-get -yq --no-install-suggests --no-install-recommends install gcc-multilib
+
+      - name: Build
+        run: go run build/ci.go test -arch 386 -short -p 8
+
   test:
     name: Test
     needs: lint
diff --git a/appveyor.yml b/appveyor.yml
index 8dce7f30a29c..aeafcfc8380b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,4 +36,4 @@ for:
       - go run build/ci.go archive -arch %GETH_ARCH% -type zip -signer WINDOWS_SIGNING_KEY -upload gethstore/builds
       - go run build/ci.go nsis -arch %GETH_ARCH% -signer WINDOWS_SIGNING_KEY -upload gethstore/builds
     test_script:
-      - go run build/ci.go test -dlgo -arch %GETH_ARCH% -cc %GETH_CC% -short -skip-spectests
+      - go run build/ci.go test -dlgo -arch %GETH_ARCH% -cc %GETH_CC% -short
diff --git a/beacon/params/config.go b/beacon/params/config.go
index 492ee53308fd..b01b739e07fe 100644
--- a/beacon/params/config.go
+++ b/beacon/params/config.go
@@ -108,6 +108,8 @@ func (c *ChainConfig) LoadForks(file []byte) error {
 			switch version := value.(type) {
 			case int:
 				versions[name] = new(big.Int).SetUint64(uint64(version)).FillBytes(make([]byte, 4))
+			case int64:
+				versions[name] = new(big.Int).SetUint64(uint64(version)).FillBytes(make([]byte, 4))
 			case uint64:
 				versions[name] = new(big.Int).SetUint64(version).FillBytes(make([]byte, 4))
 			case string:
@@ -125,6 +127,8 @@ func (c *ChainConfig) LoadForks(file []byte) error {
 			switch epoch := value.(type) {
 			case int:
 				epochs[name] = uint64(epoch)
+			case int64:
+				epochs[name] = uint64(epoch)
 			case uint64:
 				epochs[name] = epoch
 			case string:
diff --git a/build/ci.go b/build/ci.go
index 156626a82df7..59c948acb386 100644
--- a/build/ci.go
+++ b/build/ci.go
@@ -348,16 +348,15 @@ func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (
 
 func doTest(cmdline []string) {
 	var (
-		dlgo          = flag.Bool("dlgo", false, "Download Go and build with it")
-		arch          = flag.String("arch", "", "Run tests for given architecture")
-		cc            = flag.String("cc", "", "Sets C compiler binary")
-		coverage      = flag.Bool("coverage", false, "Whether to record code coverage")
-		verbose       = flag.Bool("v", false, "Whether to log verbosely")
-		race          = flag.Bool("race", false, "Execute the race detector")
-		short         = flag.Bool("short", false, "Pass the 'short'-flag to go test")
-		cachedir      = flag.String("cachedir", "./build/cache", "directory for caching downloads")
-		skipspectests = flag.Bool("skip-spectests", false, "Skip downloading execution-spec-tests fixtures")
-		threads       = flag.Int("p", 1, "Number of CPU threads to use for testing")
+		dlgo     = flag.Bool("dlgo", false, "Download Go and build with it")
+		arch     = flag.String("arch", "", "Run tests for given architecture")
+		cc       = flag.String("cc", "", "Sets C compiler binary")
+		coverage = flag.Bool("coverage", false, "Whether to record code coverage")
+		verbose  = flag.Bool("v", false, "Whether to log verbosely")
+		race     = flag.Bool("race", false, "Execute the race detector")
+		short    = flag.Bool("short", false, "Pass the 'short'-flag to go test")
+		cachedir = flag.String("cachedir", "./build/cache", "directory for caching downloads")
+		threads  = flag.Int("p", 1, "Number of CPU threads to use for testing")
 	)
 	flag.CommandLine.Parse(cmdline)
 
@@ -365,7 +364,7 @@ func doTest(cmdline []string) {
 	csdb := download.MustLoadChecksums("build/checksums.txt")
 
 	// Get test fixtures.
-	if !*skipspectests {
+	if !*short {
 		downloadSpecTestFixtures(csdb, *cachedir)
 	}