diff --git a/src/proto_alpha/lib_protocol/cache_memory_helpers.ml b/src/proto_alpha/lib_protocol/cache_memory_helpers.ml
index b114ca26c97ba7dc5a6f3273eef37e1044541a4f..45c1ec4c1dfea94326a102fc8fe2f549602ec11e 100644
--- a/src/proto_alpha/lib_protocol/cache_memory_helpers.ml
+++ b/src/proto_alpha/lib_protocol/cache_memory_helpers.ml
@@ -156,6 +156,10 @@ let boxed_tup2 x y = header_size +! word_size +! word_size +! x +! y
 
 let node_size =
   let open Micheline in
+  (* An OCaml list item occupies 3 words of memory: one for the (::)
+     constructor, one for the item itself (head) and one for the
+     remainder of the list (tail). *)
+  let list_size sns = word_size *? (List.length sns * 3) in
   let annotation_size a =
     List.fold_left
       (fun accu s -> ret_succ_adding accu (h2w +! string_size s))
@@ -166,8 +170,9 @@ let node_size =
     | Int (_, z) -> (Nodes.one, h2w +! z_size z)
     | String (_, s) -> (Nodes.one, h2w +! string_size s)
     | Bytes (_, s) -> (Nodes.one, h2w +! bytes_size s)
-    | Prim (_, _, _, a) -> ret_succ_adding (annotation_size a) h4w
-    | Seq (_, _) -> (Nodes.one, h2w)
+    | Prim (_, _, args, a) ->
+        ret_succ_adding (annotation_size a) (list_size args +! h4w)
+    | Seq (_, terms) -> (Nodes.one, list_size terms +! h2w)
   in
   fun node ->
     Script_repr.fold node zero @@ fun accu node ->
diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/test_script_cache.ml b/src/proto_alpha/lib_protocol/test/integration/michelson/test_script_cache.ml
index eae0d96f9b15165f5cee07b3354332a6f57f066a..72e866595f0b4066a58fb1f6d3079ef8eef32875 100644
--- a/src/proto_alpha/lib_protocol/test/integration/michelson/test_script_cache.ml
+++ b/src/proto_alpha/lib_protocol/test/integration/michelson/test_script_cache.ml
@@ -46,7 +46,7 @@ let err x = Exn (Script_cache_test_error x)
    model. It has been computed by a manual run of the test.
 
 *)
-let liquidity_baking_contract_size = 144640
+let liquidity_baking_contract_size = 182272
 
 let liquidity_baking_contract =
   Contract_hash.of_b58check_exn "KT1TxqZ8QtKvLu3V3JH7Gx58n7Co8pgtpQU5"
@@ -118,7 +118,7 @@ let add_some_contracts k src block baker =
    model. It has been computed by a manual run of the test.
 
 *)
-let int_store_contract_size = 496
+let int_store_contract_size = 592
 
 (*
 
diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/test_script_typed_ir_size.ml b/src/proto_alpha/lib_protocol/test/integration/michelson/test_script_typed_ir_size.ml
index 0b317366f596d3c61248ece28b00422a2a7900b7..6ede9e83c71528283a89288e684e65b40496a104 100644
--- a/src/proto_alpha/lib_protocol/test/integration/michelson/test_script_typed_ir_size.ml
+++ b/src/proto_alpha/lib_protocol/test/integration/michelson/test_script_typed_ir_size.ml
@@ -1009,6 +1009,40 @@ let check_witness_sizes () =
       .stack_prefix_preservation_witness_size
     stack_prefix_preservation
 
+let check_micheline_sizes () =
+  let open Michelson_v1_primitives in
+  let check (name, micheline) =
+    check_size ~name ~expected:Cache_memory_helpers.node_size micheline
+  in
+  let int i = Micheline.(Int (dummy_loc, Z.of_int i)) in
+  let big_int z = Micheline.(Int (dummy_loc, z)) in
+  let str s = Micheline.(String (dummy_location, String.lowercase_ascii s)) in
+  let bytes b = Micheline.(Bytes (dummy_location, Bytes.of_string b)) in
+  let prim ?(annot = []) p args =
+    Micheline.(Prim (dummy_location, p, args, annot))
+  in
+  let seq xs = Micheline.(Seq (dummy_location, xs)) in
+  List.iter_es
+    check
+    [
+      ("empty micheline", seq []);
+      ("a single number", int 1024);
+      ("a large number", big_int Z.(of_int 3 * of_int max_int));
+      ("a short string", str "tezostezostezos");
+      ("a short bytestring", bytes "tezostezostezos");
+      ("a prim with no args", prim I_UNIT []);
+      ("a seq of prims", seq [prim I_DUP []; prim I_DROP []]);
+      ("a prim with arg", prim I_DIG [int 2]);
+      ( "combine everything together",
+        seq
+          [
+            prim I_UNIT [];
+            prim I_DUG [int 3] ~annot:[String.lowercase_ascii "@number"];
+            prim I_DIP [seq [prim I_DROP [int 2]]];
+            prim I_PUSH [prim T_string []; str "tezos"];
+          ] );
+    ]
+
 let tests =
   let open Tztest in
   [
@@ -1016,4 +1050,5 @@ let tests =
     tztest "check ty size" `Quick check_ty_size;
     tztest "check kinstr size" `Quick check_kinstr_size;
     tztest "check witness sizes" `Quick check_witness_sizes;
+    tztest "check micheline sizes" `Quick check_micheline_sizes;
   ]
diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml b/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml
index d8006e0118d40f9d787f140883242f169c262298..f53a0698b6ee52a50d82a5d9fde7dc8de8800291 100644
--- a/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml
+++ b/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml
@@ -1347,7 +1347,7 @@ let test_valid_deposit_big_ticket () =
 
      This value has been fetched from the failing test, and acts as a
      regression value. *)
-  let overhead = 112 in
+  let overhead = 136 in
   context_init1 () >>=? fun (b, account) ->
   Context.get_constants (B b) >>=? fun constant ->
   let tx_rollup_max_ticket_payload_size =
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_add_first_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_add_first_transfer.out
index a023d0937d5c6be078e1e4b11e6976cf94b785dc..3ae7bc5ee79309fb6e25ca00436f14f385b73aee 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_add_first_transfer.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_add_first_transfer.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestCreateRemoveTickets::test_add_clear_tickets_add_first_transfer
 
 Node is bootstrapped.
-Estimated gas: 2576.083 units (will add 100 for safety)
+Estimated gas: 2576.197 units (will add 100 for safety)
 Estimated storage: 105 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -30,7 +30,7 @@ This sequence of operations was run:
         { Pair 0x0134d794a355dbb7027075d278a68494e91c6709ed00 (Pair "A" 1) }
       Storage size: 154 bytes
       Paid storage size diff: 105 bytes
-      Consumed gas: 2576.083
+      Consumed gas: 2576.197
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.02625
         storage fees ........................... +ꜩ0.02625
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_add_second_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_add_second_transfer.out
index 3db267bbce9fd4b3bb8b25aa3c28db51dbc51901..149eac7ee6b4a9a428de1ef717c75d1077c37892 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_add_second_transfer.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_add_second_transfer.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestCreateRemoveTickets::test_add_clear_tickets_add_second_transfer
 
 Node is bootstrapped.
-Estimated gas: 1657.385 units (will add 100 for safety)
+Estimated gas: 1657.442 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -29,6 +29,6 @@ This sequence of operations was run:
       Updated storage:
         { Pair 0x0134d794a355dbb7027075d278a68494e91c6709ed00 (Pair "B" 1) }
       Storage size: 154 bytes
-      Consumed gas: 1657.385
+      Consumed gas: 1657.442
 
 Injected block at minimal timestamp
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_add_third_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_add_third_transfer.out
index fe361e5bc218944eb165b7c33f7b312632f4b949..d924a3fc4e93e268ef68d761c091142b0f9170d9 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_add_third_transfer.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_add_third_transfer.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestCreateRemoveTickets::test_add_clear_tickets_add_third_transfer
 
 Node is bootstrapped.
-Estimated gas: 2333.004 units (will add 100 for safety)
+Estimated gas: 2333.061 units (will add 100 for safety)
 Estimated storage: 105 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -31,7 +31,7 @@ This sequence of operations was run:
           Pair 0x0134d794a355dbb7027075d278a68494e91c6709ed00 (Pair "B" 1) }
       Storage size: 193 bytes
       Paid storage size diff: 105 bytes
-      Consumed gas: 2333.004
+      Consumed gas: 2333.061
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.02625
         storage fees ........................... +ꜩ0.02625
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_clear_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_clear_transfer.out
index 52a9de5272e2e7e467da388509129ff78addd86b..a0acc70c165dcecf9daaf89e568a60bfc63f6353 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_clear_transfer.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestCreateRemoveTickets::test_add_clear_tickets_clear_transfer.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestCreateRemoveTickets::test_add_clear_tickets_clear_transfer
 
 Node is bootstrapped.
-Estimated gas: 1845.764 units (will add 100 for safety)
+Estimated gas: 1845.821 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -27,6 +27,6 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: {}
       Storage size: 115 bytes
-      Consumed gas: 1845.764
+      Consumed gas: 1845.821
 
 Injected block at minimal timestamp
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out
index a9a0757c9eaf836cd9b87a834ad742eb3f4e2dda..db5c6a0dc751c1c0bfb843474e15e107ff235526 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestOriginateContractFromContract::test_originate_contract_from_contract_transfer
 
 Node is bootstrapped.
-Estimated gas: 3524.633 units (will add 100 for safety)
+Estimated gas: 3524.747 units (will add 100 for safety)
 Estimated storage: 295 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -26,7 +26,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 93 bytes
-      Consumed gas: 2120.566
+      Consumed gas: 2120.680
       Internal operations:
         Internal Origination:
           From: [CONTRACT_HASH]
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out
index da8e968e8b3db8f9da03af0d8007f1a993b6ab41..e3f68762ec72ead8e48437315062b6a4bbc2b997 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_send_self_address.out
@@ -1,7 +1,7 @@
 tests_alpha/test_contract.py::TestSelfAddressTransfer::test_send_self_address
 
 Node is bootstrapped.
-Estimated gas: 4692.499 units (will add 100 for safety)
+Estimated gas: 4692.727 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -27,7 +27,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 82 bytes
-      Consumed gas: 2575.321
+      Consumed gas: 2575.435
       Internal operations:
         Internal Transaction:
           Amount: ꜩ0
@@ -37,6 +37,6 @@ This sequence of operations was run:
           This transaction was successfully applied
           Updated storage: Unit
           Storage size: 83 bytes
-          Consumed gas: 2117.178
+          Consumed gas: 2117.292
 
 Injected block at minimal timestamp
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out
index 3634539f823036115ccb1e4f9137c3fb9eeb9a00..106bc2d31951862a6f4bf928615618e13cd4cc63 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out
@@ -47,7 +47,7 @@ Contract memorized as level.
 Injected block at minimal timestamp
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2109.196 units (will add 100 for safety)
+Estimated gas: 2109.310 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -72,7 +72,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: 4
       Storage size: 40 bytes
-      Consumed gas: 2109.196
+      Consumed gas: 2109.310
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ500
         [CONTRACT_HASH] ... +ꜩ500
@@ -89,7 +89,7 @@ Injected block at minimal timestamp
 Injected block at minimal timestamp
 4
 Node is bootstrapped.
-Estimated gas: 1202.860 units (will add 100 for safety)
+Estimated gas: 1202.917 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -114,7 +114,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: 7
       Storage size: 40 bytes
-      Consumed gas: 1202.860
+      Consumed gas: 1202.917
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ500
         [CONTRACT_HASH] ... +ꜩ500
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out
index d6090e11f9b3d10838530adc61e6692f375248f8..c8938c0a7b487bbe04f511cbcd1893ab7ffe6591 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out
@@ -48,7 +48,7 @@ Injected block at minimal timestamp
 Injected block at minimal timestamp
 none
 Node is bootstrapped.
-Estimated gas: 3115.330 units (will add 100 for safety)
+Estimated gas: 3115.444 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -74,7 +74,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 51 bytes
-      Consumed gas: 2115.330
+      Consumed gas: 2115.444
       Internal operations:
         Internal Delegation:
           Contract: [CONTRACT_HASH]
@@ -85,7 +85,7 @@ This sequence of operations was run:
 Injected block at minimal timestamp
 [CONTRACT_HASH] (known as bootstrap5)
 Node is bootstrapped.
-Estimated gas: 2202.911 units (will add 100 for safety)
+Estimated gas: 2202.968 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -111,7 +111,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 51 bytes
-      Consumed gas: 1202.911
+      Consumed gas: 1202.968
       Internal operations:
         Internal Delegation:
           Contract: [CONTRACT_HASH]
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out
index e79b36fbba56231989607ac87acca14848102e25..1257a1a5b4777caa69f594e12708e19951f7dae7 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out	
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b.7da5c9014e.out	
@@ -1,7 +1,7 @@
 tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_slice_success[(Pair 0xe009ab79e8b84ef0e55c43a9a857214d8761e67b75ba63500a5694fb2ffe174acc2de22d01ccb7259342437f05e1987949f0ad82e9f32e9a0b79cb252d7f7b8236ad728893f4e7150742eefdbeda254970f9fcd92c6228c178e1a923e5600758eb83f2a05edd0be7625657901f2ba81eaf145d003dbef78e33f43a32a3788bdf0501000000085341554349535345 "spsig1PPUFZucuAQybs5wsqsNQ68QNgFaBnVKMFaoZZfi1BtNnuCAWnmL9wVy5HfHkR6AeodjVGxpBVVSYcJKyMURn6K1yknYLm")]
 
 Node is bootstrapped.
-Estimated gas: 3595.429 units (will add 100 for safety)
+Estimated gas: 3595.543 units (will add 100 for safety)
 Estimated storage: 257 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -29,7 +29,7 @@ This sequence of operations was run:
       Updated storage:
         [OPERATION_HASH]48f709699019725ba
       Storage size: 578 bytes
-      Consumed gas: 2595.429
+      Consumed gas: 2595.543
       Internal operations:
         Internal Transaction:
           Amount: ꜩ1000
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out
index bfa716f7af95d009f2fe5f2823693ebb27d127af..7fdebf1889472c5728ec3cb2976bab1840a47dbc 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out
@@ -46,7 +46,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as source.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2110.535 units (will add 100 for safety)
+Estimated gas: 2110.649 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -71,14 +71,14 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c
       Storage size: 65 bytes
-      Consumed gas: 2110.535
+      Consumed gas: 2110.649
 
 Injected block at minimal timestamp
 "[CONTRACT_HASH]"
 [CONTRACT_HASH]
 
 Node is bootstrapped.
-Estimated gas: 3772.043 units (will add 100 for safety)
+Estimated gas: 3772.214 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -104,7 +104,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 55 bytes
-      Consumed gas: 2568.898
+      Consumed gas: 2569.012
       Internal operations:
         Internal Transaction:
           Amount: ꜩ0
@@ -113,7 +113,7 @@ This sequence of operations was run:
           This transaction was successfully applied
           Updated storage: 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c
           Storage size: 65 bytes
-          Consumed gas: 1203.145
+          Consumed gas: 1203.202
 
 Injected block at minimal timestamp
 "[CONTRACT_HASH]"
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out
index 60bdb32cbd6afff43f5661d9434a6d7141edbff3..8b8be41bc1b8963a8dc41cda0219c31fd8914021 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out
@@ -68,7 +68,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as split_bytes.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2151.437 units (will add 100 for safety)
+Estimated gas: 2151.551 units (will add 100 for safety)
 Estimated storage: 18 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -95,7 +95,7 @@ This sequence of operations was run:
       Updated storage: { 0xaa ; 0xbb ; 0xcc }
       Storage size: 272 bytes
       Paid storage size diff: 18 bytes
-      Consumed gas: 2151.437
+      Consumed gas: 2151.551
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.0045
         storage fees ........................... +ꜩ0.0045
@@ -103,7 +103,7 @@ This sequence of operations was run:
 Injected block at minimal timestamp
 { 0xaa ; 0xbb ; 0xcc }
 Node is bootstrapped.
-Estimated gas: 1206.523 units (will add 100 for safety)
+Estimated gas: 1206.580 units (will add 100 for safety)
 Estimated storage: 18 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -130,7 +130,7 @@ This sequence of operations was run:
       Updated storage: { 0xaa ; 0xbb ; 0xcc ; 0xdd ; 0xee ; 0xff }
       Storage size: 290 bytes
       Paid storage size diff: 18 bytes
-      Consumed gas: 1206.523
+      Consumed gas: 1206.580
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.0045
         storage fees ........................... +ꜩ0.0045
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out
index e918d5b4decab46e40c39134dfa9885b5a6de5f4..748444a346508b93b73569b2bd736a4533436506 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out
@@ -68,7 +68,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as split_string.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2151.501 units (will add 100 for safety)
+Estimated gas: 2151.615 units (will add 100 for safety)
 Estimated storage: 18 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -95,7 +95,7 @@ This sequence of operations was run:
       Updated storage: { "a" ; "b" ; "c" }
       Storage size: 272 bytes
       Paid storage size diff: 18 bytes
-      Consumed gas: 2151.501
+      Consumed gas: 2151.615
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.0045
         storage fees ........................... +ꜩ0.0045
@@ -103,7 +103,7 @@ This sequence of operations was run:
 Injected block at minimal timestamp
 { "a" ; "b" ; "c" }
 Node is bootstrapped.
-Estimated gas: 1206.587 units (will add 100 for safety)
+Estimated gas: 1206.644 units (will add 100 for safety)
 Estimated storage: 18 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -130,7 +130,7 @@ This sequence of operations was run:
       Updated storage: { "a" ; "b" ; "c" ; "d" ; "e" ; "f" }
       Storage size: 290 bytes
       Paid storage size diff: 18 bytes
-      Consumed gas: 1206.587
+      Consumed gas: 1206.644
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.0045
         storage fees ........................... +ꜩ0.0045
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out
index 3d9cc45423a5cf2dd2c69d8c15f8f1cf2bbcf2e0..e9e05c5b14bda57d1a00f2bbc68c9d04428a3ad6 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out
@@ -112,7 +112,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as store_input.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2108.931 units (will add 100 for safety)
+Estimated gas: 2109.045 units (will add 100 for safety)
 Estimated storage: 7 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -125,7 +125,7 @@ This sequence of operations was run:
     From: [CONTRACT_HASH]
     Fee to the baker: ꜩ0.000489
     Expected counter: [EXPECTED_COUNTER]
-    Gas limit: 2209
+    Gas limit: 2210
     Storage limit: 27 bytes
     Balance updates:
       [CONTRACT_HASH] ... -ꜩ0.000489
@@ -139,7 +139,7 @@ This sequence of operations was run:
       Updated storage: "abcdefg"
       Storage size: 48 bytes
       Paid storage size diff: 7 bytes
-      Consumed gas: 2108.931
+      Consumed gas: 2109.045
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.00175
         storage fees ........................... +ꜩ0.00175
@@ -150,7 +150,7 @@ Injected block at minimal timestamp
 200 ꜩ
 "abcdefg"
 Node is bootstrapped.
-Estimated gas: 1203.043 units (will add 100 for safety)
+Estimated gas: 1203.100 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -176,7 +176,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: "xyz"
       Storage size: 44 bytes
-      Consumed gas: 1203.043
+      Consumed gas: 1203.100
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ100
         [CONTRACT_HASH] ... +ꜩ100
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out
index 42989b6be5a2ae2602b963c25a94e096808c13e3..6c015cf72912e7b0c5fb372cc4f0e769859a6309 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out
@@ -46,7 +46,7 @@ New contract [CONTRACT_HASH] originated.
 Contract memorized as transfer_amount.
 Injected block at minimal timestamp
 Node is bootstrapped.
-Estimated gas: 2109.161 units (will add 100 for safety)
+Estimated gas: 2109.275 units (will add 100 for safety)
 Estimated storage: 4 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -72,7 +72,7 @@ This sequence of operations was run:
       Updated storage: 500000000
       Storage size: 44 bytes
       Paid storage size diff: 4 bytes
-      Consumed gas: 2109.161
+      Consumed gas: 2109.275
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.001
         storage fees ........................... +ꜩ0.001
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out
index 43ffd2417a7a16ddc180d1af15f277b8d93865c5..8b93dd0b75515b35c6bee096e699febc7dcf99f4 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out
@@ -143,7 +143,7 @@ Injected block at minimal timestamp
 [CONTRACT_HASH]
 
 Node is bootstrapped.
-Estimated gas: 4679.259 units (will add 100 for safety)
+Estimated gas: 4679.487 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -169,7 +169,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 66 bytes
-      Consumed gas: 2570.942
+      Consumed gas: 2571.056
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ100
         [CONTRACT_HASH] ... +ꜩ100
@@ -181,7 +181,7 @@ This sequence of operations was run:
           This transaction was successfully applied
           Updated storage: Unit
           Storage size: 38 bytes
-          Consumed gas: 2108.317
+          Consumed gas: 2108.431
           Balance updates:
             [CONTRACT_HASH] ... -ꜩ100
             [CONTRACT_HASH] ... +ꜩ100
@@ -191,7 +191,7 @@ Injected block at minimal timestamp
 [CONTRACT_HASH]
 
 Node is bootstrapped.
-Estimated gas: 3767.519 units (will add 100 for safety)
+Estimated gas: 3767.690 units (will add 100 for safety)
 Estimated storage: no bytes added
 Operation successfully injected in the node.
 Operation hash is '[BLOCK_HASH]'
@@ -217,7 +217,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: Unit
       Storage size: 66 bytes
-      Consumed gas: 1659.202
+      Consumed gas: 1659.259
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ100
         [CONTRACT_HASH] ... +ꜩ100
@@ -229,7 +229,7 @@ This sequence of operations was run:
           This transaction was successfully applied
           Updated storage: Unit
           Storage size: 38 bytes
-          Consumed gas: 2108.317
+          Consumed gas: 2108.431
           Balance updates:
             [CONTRACT_HASH] ... -ꜩ100
             [CONTRACT_HASH] ... +ꜩ100
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out
index 3d10d78f26fc69b6c375b70f8a65c8f57a9792a7..a405413a52606c5dd4071a7fd73d5baf7dd1ef6f 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_call_mint_or_burn.out
@@ -32,7 +32,7 @@ This sequence of operations was run:
         Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 100000000
       Storage size: 1982 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 3217.690
+      Consumed gas: 3217.747
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out
index 3959740c9ec5a8287c456918b408c9c468c5b0f2..5b8ae877569ab5d8a096e5e8d99468d7c8b9c0b0 100644
--- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out
+++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_call_mint_or_burn.out
@@ -32,7 +32,7 @@ This sequence of operations was run:
         Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 100000000
       Storage size: 1982 bytes
       Paid storage size diff: 71 bytes
-      Consumed gas: 3217.690
+      Consumed gas: 3217.747
       Balance updates:
         [CONTRACT_HASH] ... -ꜩ0.01775
         storage fees ........................... +ꜩ0.01775
diff --git a/tezt/tests/expected/views.ml/Alpha- Run views.out b/tezt/tests/expected/views.ml/Alpha- Run views.out
index d9850471712fff41e7f9aeedf901301485df9182..ecad0981102347da94180fe20e897852ee190695 100644
--- a/tezt/tests/expected/views.ml/Alpha- Run views.out	
+++ b/tezt/tests/expected/views.ml/Alpha- Run views.out	
@@ -171,7 +171,7 @@ This sequence of operations was run:
       This transaction was successfully applied
       Updated storage: None
       Storage size: 208 bytes
-      Consumed gas: 4414.445
+      Consumed gas: 4414.559
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ1
         KT1NF5f9FWtVX4w23xt9hxvmyfa4gsbcQ8tX ... +ꜩ1
@@ -205,7 +205,7 @@ This sequence of operations was run:
       Updated storage: { 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 }
       Storage size: 179 bytes
       Paid storage size diff: 27 bytes
-      Consumed gas: 2117.465
+      Consumed gas: 2117.579
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.00675
         storage fees ........................... +ꜩ0.00675
@@ -242,7 +242,7 @@ This sequence of operations was run:
       Updated storage: (Some 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78)
       Storage size: 235 bytes
       Paid storage size diff: 27 bytes
-      Consumed gas: 4417.702
+      Consumed gas: 4417.816
       Balance updates:
         tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.00675
         storage fees ........................... +ꜩ0.00675
diff --git a/tezt/tests/tx_rollup.ml b/tezt/tests/tx_rollup.ml
index abb797a62ba2632992944bd071106582dceb72ed..2281a0c47f63287c720946d5f3cbb59130efd863 100644
--- a/tezt/tests/tx_rollup.ml
+++ b/tezt/tests/tx_rollup.ml
@@ -1509,7 +1509,7 @@ let test_deposit_withdraw_max_big_tickets =
 
        This value has been fetched from the failing test, and acts as a
        regression value. *)
-    let overhead = 232 in
+    let overhead = 256 in
     JSON.(constants |-> "tx_rollup_max_ticket_payload_size" |> as_int)
     - overhead
   in