diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 725ed920..d391b22e 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -6,7 +6,7 @@ name: Test executor inputs
 on:
   workflow_dispatch:
   pull_request:
-    branches: [main, develop, develop-no-opt, develop-feijoa]
+    branches: [main, develop, develop-no-opt, develop-feijoa, feature/25]
 
 jobs:
   build:
diff --git a/main/opcodes/stack-operations.zkasm b/main/opcodes/stack-operations.zkasm
index c7b419c4..9c55235d 100644
--- a/main/opcodes/stack-operations.zkasm
+++ b/main/opcodes/stack-operations.zkasm
@@ -127,16 +127,17 @@ opPUSH32:
 opAuxPUSHA:
     ; checks zk-counters
     %MAX_CNT_STEPS - STEP - 100 :JMPN(outOfCountersStep)
+    ; check out-of-gas
+    GAS - %GAS_FASTEST_STEP => GAS      :JMPN(outOfGas)
 
     $ => B              :MLOAD(bytecodeLength)
     PC + D - B          :JMPN(opAuxPUSHA2)
-    B - PC => D
+    B - PC => D,E       :JMPZ(lastOpcodeIsPush)
 
 opAuxPUSHA2:
-    ; check out-of-gas
-    GAS - %GAS_FASTEST_STEP => GAS      :JMPN(outOfGas)
     ; read bytes from calldata
     D => E              :CALL(readPush); in: [D,E: bytes to read] out: [E: value read]
+lastOpcodeIsPush:
     ; store stack output
     E                   :MSTORE(SP++); [pushed_value(E) => SP]
     ; check stack overflow
diff --git a/package.json b/package.json
index 4ab4a76d..45a070fd 100644
--- a/package.json
+++ b/package.json
@@ -43,9 +43,9 @@
     "yargs": "^17.5.1"
   },
   "devDependencies": {
-    "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#v6.0.0-fork.9",
-    "@0xpolygonhermez/zkevm-proverjs": "github:0xPolygonHermez/zkevm-proverjs#b8c17caeb6fe1c234f2c1d2dba5c26c6c3951665",
-    "@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#v6.0.1-fork.9",
+    "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#v7.0.0-fork.10-11",
+    "@0xpolygonhermez/zkevm-proverjs": "github:0xPolygonHermez/zkevm-proverjs#v7.0.0-fork.10-11",
+    "@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#v7.0.0-fork.11",
     "chai": "^4.3.6",
     "chalk": "^3.0.0",
     "eslint": "^8.25.0",
diff --git a/tools/parallel-testing/parallel-tests-sample/sample.test.js b/tools/parallel-testing/parallel-tests-sample/sample.test.js
index fbc55079..6c9a44aa 100644
--- a/tools/parallel-testing/parallel-tests-sample/sample.test.js
+++ b/tools/parallel-testing/parallel-tests-sample/sample.test.js
@@ -13,7 +13,7 @@ const smMain = require('@0xpolygonhermez/zkevm-proverjs/src/sm/sm_main/sm_main')
 
 let rom = require('../../../build/rom.json');
 
-let stepsN = 2 ** 23;
+let stepsN = 2 ** 25;
 let counters = false;
 
 const fileCachePil = path.join(__dirname, '../../../node_modules/@0xpolygonhermez/zkevm-proverjs/cache-main-pil.json');