diff --git a/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/jump.hpp b/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/jump.hpp
index 9dfae5947d..50c9b72ebd 100644
--- a/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/jump.hpp
+++ b/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/jump.hpp
@@ -87,8 +87,9 @@ namespace nil {
                             current_state.bytecode_hash_hi(0),
                             current_state.bytecode_hash_lo(0)
                         };
-                        lookup(tmp, "zkevm_bytecode");
-
+                        // TODO(oclaw): bytecode check is disabled since hash algorithm for circuits is not finalized yet
+                        // https://github.com/NilFoundation/placeholder/issues/205
+                        // lookup(tmp, "zkevm_bytecode");
                     }
                 }
             };
diff --git a/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/jumpi.hpp b/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/jumpi.hpp
index 0819e95063..33dd4e0c5e 100644
--- a/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/jumpi.hpp
+++ b/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/jumpi.hpp
@@ -126,7 +126,9 @@ namespace nil {
                             is_jump * current_state.bytecode_hash_hi(0),
                             is_jump * current_state.bytecode_hash_lo(0)
                         };
-                        lookup(tmp, "zkevm_bytecode");
+                        // TODO(oclaw): bytecode check is disabled since hash algorithm for circuits is not finalized yet
+                        // https://github.com/NilFoundation/placeholder/issues/205
+                        // lookup(tmp, "zkevm_bytecode");
                     }
                 }
             };
diff --git a/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/pushx.hpp b/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/pushx.hpp
index 0d94dae199..b11a819c3e 100644
--- a/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/pushx.hpp
+++ b/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/pushx.hpp
@@ -108,7 +108,9 @@ namespace nil {
                                     current_state.bytecode_hash_lo(1)
                                 };
                             }
-                            lookup(tmp, "zkevm_bytecode");
+                            // TODO(oclaw): bytecode check is disabled since hash algorithm for circuits is not finalized yet
+                            // https://github.com/NilFoundation/placeholder/issues/205
+                            // lookup(tmp, "zkevm_bytecode");
                         }
                     }
                 }
diff --git a/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/swapx.hpp b/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/swapx.hpp
index 0b40c4e34a..2197a94f54 100644
--- a/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/swapx.hpp
+++ b/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/opcodes/swapx.hpp
@@ -29,6 +29,7 @@
 
 #include <nil/blueprint/zkevm/zkevm_word.hpp>
 #include <nil/blueprint/zkevm_bbf/types/opcode.hpp>
+#include <nil/blueprint/zkevm_bbf/types/rw_operation.hpp>
 
 namespace nil {
     namespace blueprint {
diff --git a/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/zkevm.hpp b/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/zkevm.hpp
index 4a6b8b5ce5..45420f5052 100644
--- a/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/zkevm.hpp
+++ b/crypto3/libs/blueprint/include/nil/blueprint/zkevm_bbf/zkevm.hpp
@@ -527,7 +527,10 @@ namespace nil {
                         tmp[3] = context_object.relativize(evm_opcode_constraint, -1);
                         tmp[4] = context_object.relativize(evm_opcode_constraint * all_states[1].bytecode_hash_hi, -1);
                         tmp[5] = context_object.relativize(evm_opcode_constraint * all_states[1].bytecode_hash_lo, -1);
-                        context_object.relative_lookup(tmp, "zkevm_bytecode", 1, max_zkevm_rows-1);
+                        
+                        // TODO(oclaw): bytecode check is disabled since hash algorithm for circuits is not finalized yet
+                        // https://github.com/NilFoundation/placeholder/issues/205
+                        // context_object.relative_lookup(tmp, "zkevm_bytecode", 1, max_zkevm_rows-1);
                    }
                 }
             protected:
diff --git a/proof-producer/libs/preset/include/nil/proof-generator/preset/limits.hpp b/proof-producer/libs/preset/include/nil/proof-generator/preset/limits.hpp
index d1806b47d1..246a9ef4f8 100644
--- a/proof-producer/libs/preset/include/nil/proof-generator/preset/limits.hpp
+++ b/proof-producer/libs/preset/include/nil/proof-generator/preset/limits.hpp
@@ -13,7 +13,7 @@ namespace nil {
             const std::size_t max_bytecode_size = 20000;
             const std::size_t max_rows = 500000;   
             const std::size_t max_mpt_size = 30;
-            const std::size_t max_zkevm_rows = 50000;
+            const std::size_t max_zkevm_rows = 25000;
 
             const std::size_t RLC_CHALLENGE = 7; // should be the same between all components
 
diff --git a/proof-producer/tests/bin/proof-producer/resources/traces/increment_multi_tx.pb.rw b/proof-producer/tests/bin/proof-producer/resources/traces/increment_multi_tx.pb.rw
index f7444a8626..95211a293e 100644
Binary files a/proof-producer/tests/bin/proof-producer/resources/traces/increment_multi_tx.pb.rw and b/proof-producer/tests/bin/proof-producer/resources/traces/increment_multi_tx.pb.rw differ
diff --git a/proof-producer/tests/bin/proof-producer/resources/traces/increment_multi_tx.pb.zkevm b/proof-producer/tests/bin/proof-producer/resources/traces/increment_multi_tx.pb.zkevm
index 7721a92c9b..def5df471f 100644
Binary files a/proof-producer/tests/bin/proof-producer/resources/traces/increment_multi_tx.pb.zkevm and b/proof-producer/tests/bin/proof-producer/resources/traces/increment_multi_tx.pb.zkevm differ
diff --git a/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.bc b/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.bc
index 8bf6398a63..5d2aed0c5d 100644
Binary files a/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.bc and b/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.bc differ
diff --git a/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.copy b/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.copy
index 4559e0871b..c971e6c4e0 100644
Binary files a/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.copy and b/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.copy differ
diff --git a/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.rw b/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.rw
index 7ae0400419..f1d380ff40 100644
Binary files a/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.rw and b/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.rw differ
diff --git a/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.zkevm b/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.zkevm
index b87a67f418..fc6b5b7093 100644
Binary files a/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.zkevm and b/proof-producer/tests/bin/proof-producer/resources/traces/increment_simple.pb.zkevm differ
diff --git a/proof-producer/tests/bin/proof-producer/test_zkevm_bbf_circuits.cpp b/proof-producer/tests/bin/proof-producer/test_zkevm_bbf_circuits.cpp
index 3afa99b867..725df9b74d 100644
--- a/proof-producer/tests/bin/proof-producer/test_zkevm_bbf_circuits.cpp
+++ b/proof-producer/tests/bin/proof-producer/test_zkevm_bbf_circuits.cpp
@@ -66,13 +66,13 @@ const std::string SimpleIncrement = "increment_simple.pb";
 INSTANTIATE_TEST_SUITE_P(SimpleRw, ProverTests, ::testing::Values(Input{SimpleIncrement,  RW}));
 INSTANTIATE_TEST_SUITE_P(SimpleBytecode, ProverTests, ::testing::Values(Input{SimpleIncrement,  BYTECODE}));
 INSTANTIATE_TEST_SUITE_P(SimpleCopy, ProverTests, ::testing::Values(Input{SimpleIncrement,  COPY}));
-INSTANTIATE_TEST_SUITE_P(SimpleZkevm, ProverTests, ::testing::Values(Input{SimpleIncrement,  ZKEVM, true}));  // TODO
+INSTANTIATE_TEST_SUITE_P(SimpleZkevm, ProverTests, ::testing::Values(Input{SimpleIncrement,  ZKEVM}));
 
 // Multiple calls of Counter contract increment function (several transactions)
 // !! note that due to https://github.com/NilFoundation/placeholder/issues/196
 // contracts for these traces were compiled with --no-cbor-metadata flag
 const std::string MultiTxIncrement = "increment_multi_tx.pb"; 
 INSTANTIATE_TEST_SUITE_P(MultiTxRw, ProverTests, ::testing::Values(Input{MultiTxIncrement,  RW})); 
-INSTANTIATE_TEST_SUITE_P(MultiTxBytecode, ProverTests, ::testing::Values(Input{MultiTxIncrement,  BYTECODE}));
+INSTANTIATE_TEST_SUITE_P(MultiTxBytecode, ProverTests, :: testing::Values(Input{MultiTxIncrement,  BYTECODE}));
 INSTANTIATE_TEST_SUITE_P(MultiTxCopy, ProverTests, ::testing::Values(Input{MultiTxIncrement,  COPY}));
-INSTANTIATE_TEST_SUITE_P(MultiTxZkevm, ProverTests, ::testing::Values(Input{MultiTxIncrement,  ZKEVM, true})); // TODO
+INSTANTIATE_TEST_SUITE_P(MultiTxZkevm, ProverTests, ::testing::Values(Input{MultiTxIncrement,  ZKEVM}));