diff --git a/simulators/ethereum/gnosis-engine-jq/Dockerfile.debug b/simulators/ethereum/gnosis-engine-jq/Dockerfile.debug
index e080e9fd4c..15aa60f258 100644
--- a/simulators/ethereum/gnosis-engine-jq/Dockerfile.debug
+++ b/simulators/ethereum/gnosis-engine-jq/Dockerfile.debug
@@ -1,5 +1,5 @@
 # This simulation runs Engine API tests.
-FROM golang:1.22-alpine as builder
+FROM golang:1.20-alpine as builder
 RUN apk add --update gcc musl-dev linux-headers
 
 
diff --git a/simulators/ethereum/gnosis-engine-jq/globals/globals.go b/simulators/ethereum/gnosis-engine-jq/globals/globals.go
index f0767b3519..ab194bf8e3 100644
--- a/simulators/ethereum/gnosis-engine-jq/globals/globals.go
+++ b/simulators/ethereum/gnosis-engine-jq/globals/globals.go
@@ -78,7 +78,7 @@ var (
 	TestAccounts     []*TestAccount
 
 	// Global test case timeout
-	DefaultTestCaseTimeout = time.Minute * 5
+	DefaultTestCaseTimeout = time.Minute * 10
 
 	// Confirmation blocks
 	PoWConfirmationBlocks = uint64(15)
diff --git a/simulators/ethereum/gnosis-engine-jq/main.go b/simulators/ethereum/gnosis-engine-jq/main.go
index 404d13470f..f34d466d31 100644
--- a/simulators/ethereum/gnosis-engine-jq/main.go
+++ b/simulators/ethereum/gnosis-engine-jq/main.go
@@ -166,18 +166,24 @@ func makeRunner(tests []test.Spec, nodeType string) func(t *hivesim.T) {
 
 			timestamp := new(big.Int).SetUint64(getTimestamp(currentTest))
 
+			if currentTest.GetMainFork() != "Cancun" {
+				globals.GenesisTimestamp = timestamp.Uint64()
+			}
+
 			// Load the genesis file specified and dynamically bundle it.
 			genesis := currentTest.GetGenesis()
 			forkConfig := currentTest.GetForkConfig()
 
 			cancunTimestamp := new(big.Int).Add(timestamp, big.NewInt(0))
 			shanghaiTimestamp := new(big.Int).Add(timestamp, big.NewInt(-1000000))
-			forkConfig.ShanghaiTimestamp = shanghaiTimestamp
 			forkConfig.CancunTimestamp = cancunTimestamp
+
 			if currentTest.GetMainFork() == "Cancun" {
-				forkConfig.ShanghaiTimestamp = forkConfig.CancunTimestamp
+				shanghaiTimestamp = forkConfig.CancunTimestamp
 			}
 
+			forkConfig.ShanghaiTimestamp = shanghaiTimestamp
+
 			if forkConfig == nil {
 				// Test cannot be configured as is for current fork, skip
 				fmt.Printf("skipping test \"%s\" because fork configuration is not possible\n", currentTestName)