diff --git a/src/proto_alpha/bin_sc_rollup_node/interpreter.ml b/src/proto_alpha/bin_sc_rollup_node/interpreter.ml
index 0b649f31de41cf8b88aa19c529a2fcb08b15bcaa..15e1710caa82d3b5e26e0864d8cd44d8f0cac4fa 100644
--- a/src/proto_alpha/bin_sc_rollup_node/interpreter.ml
+++ b/src/proto_alpha/bin_sc_rollup_node/interpreter.ml
@@ -64,15 +64,56 @@ module Make (PVM : Pvm.S) : S with module PVM = PVM = struct
     let origination_level = node_ctxt.genesis_info.Sc_rollup.Commitment.level in
     Sc_rollup.Metadata.{address; origination_level}
 
+  (** [get_boot_sector block_hash node_ctxt] fetches the operations in the
+      [block_hash] and looks for the bootsector used to originate the rollup
+      we're following.
+      It must be called with [block_hash.level] = [node_ctxt.genesis_info.level].
+  *)
+  let get_boot_sector block_hash (node_ctxt : Node_context.t) =
+    let open Lwt_result_syntax in
+    let exception Found_boot_sector of string in
+    let* block = Layer1.fetch_tezos_block node_ctxt.l1_ctxt block_hash in
+    let missing_boot_sector () =
+      failwith
+        "Boot sector not found in Tezos block %a"
+        Tezos_crypto.Block_hash.pp
+        block_hash
+    in
+    Lwt.catch
+      (fun () ->
+        let apply (type kind) accu ~source:_
+            (operation : kind manager_operation)
+            (result : kind Apply_results.successful_manager_operation_result) =
+          match (operation, result) with
+          | ( Sc_rollup_originate {kind; boot_sector; _},
+              Sc_rollup_originate_result {address; _} )
+            when node_ctxt.rollup_address = address && node_ctxt.kind = kind ->
+              raise (Found_boot_sector boot_sector)
+          | _ -> accu
+        in
+        let apply_internal (type kind) accu ~source:_
+            (_operation : kind Apply_internal_results.internal_operation)
+            (_result :
+              kind Apply_internal_results.successful_internal_operation_result)
+            =
+          accu
+        in
+        let*? () =
+          Layer1_services.(
+            process_applied_manager_operations
+              (Ok ())
+              block.operations
+              {apply; apply_internal})
+        in
+        missing_boot_sector ())
+      (function
+        | Found_boot_sector boot_sector -> return boot_sector
+        | _ -> missing_boot_sector ())
+
   let genesis_state block_hash node_ctxt ctxt =
     let open Node_context in
     let open Lwt_result_syntax in
-    let* boot_sector =
-      Plugin.RPC.Sc_rollup.boot_sector
-        node_ctxt.cctxt
-        (node_ctxt.cctxt#chain, `Hash (block_hash, 0))
-        node_ctxt.rollup_address
-    in
+    let* boot_sector = get_boot_sector block_hash node_ctxt in
     let*! initial_state = PVM.initial_state node_ctxt.context in
     let*! genesis_state = PVM.install_boot_sector initial_state boot_sector in
     let*! ctxt = PVM.State.set ctxt genesis_state in
diff --git a/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml b/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml
index 4a6df2192686c11e884e7e621b3a2141aa15adfd..b26521b796fff1203af406632eabac7772413fb6 100644
--- a/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml
+++ b/src/proto_alpha/lib_benchmarks_proto/sc_rollup_benchmarks.ml
@@ -239,7 +239,6 @@ module Sc_rollup_add_external_messages_benchmark = struct
         @@ Sc_rollup_storage.originate
              ctxt
              ~kind
-             ~boot_sector
              ~parameters_ty
              ~genesis_commitment
       in
diff --git a/src/proto_alpha/lib_plugin/RPC.ml b/src/proto_alpha/lib_plugin/RPC.ml
index 1d891980a23f6901f6d43619edf0250bbd9c88f7..f9c59be30ea593d587fa1fb1576414e9cecf6d84 100644
--- a/src/proto_alpha/lib_plugin/RPC.ml
+++ b/src/proto_alpha/lib_plugin/RPC.ml
@@ -2191,15 +2191,6 @@ module Sc_rollup = struct
     in
     genesis_info
 
-  let register_boot_sector () =
-    Registration.register1 ~chunked:true S.boot_sector
-    @@ fun ctxt address () () ->
-    let open Lwt_result_syntax in
-    let+ _ctxt, boot_sector =
-      Alpha_context.Sc_rollup.get_boot_sector ctxt address
-    in
-    boot_sector
-
   let register_last_cemented_commitment_hash_with_level () =
     Registration.register1
       ~chunked:false
@@ -2314,7 +2305,6 @@ module Sc_rollup = struct
     register_kind () ;
     register_inbox () ;
     register_genesis_info () ;
-    register_boot_sector () ;
     register_last_cemented_commitment_hash_with_level () ;
     register_staked_on_commitment () ;
     register_commitment () ;
@@ -2353,9 +2343,6 @@ module Sc_rollup = struct
       ()
       ()
 
-  let boot_sector ctxt block sc_rollup_address =
-    RPC_context.make_call1 S.boot_sector ctxt block sc_rollup_address () ()
-
   let ongoing_refutation_game ctxt block sc_rollup_address staker =
     RPC_context.make_call1
       S.ongoing_refutation_game
diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli
index b478a200abec3c006c70e5656dc67cc60260854c..cbe118e0b754559d472c1d8bcbffd40cd408ec7a 100644
--- a/src/proto_alpha/lib_protocol/alpha_context.mli
+++ b/src/proto_alpha/lib_protocol/alpha_context.mli
@@ -3742,7 +3742,6 @@ module Sc_rollup : sig
   val originate :
     context ->
     kind:Kind.t ->
-    boot_sector:string ->
     parameters_ty:Script.lazy_expr ->
     genesis_commitment:Commitment.t ->
     (t * Z.t * Commitment.Hash.t * context) tzresult Lwt.t
@@ -4084,8 +4083,6 @@ module Sc_rollup : sig
   val genesis_info :
     context -> rollup -> (context * Commitment.genesis_info) tzresult Lwt.t
 
-  val get_boot_sector : context -> t -> (context * string) tzresult Lwt.t
-
   (** This module discloses definitions that are only useful for tests and
     must not be used otherwise. *)
   module Internal_for_tests : sig
diff --git a/src/proto_alpha/lib_protocol/sc_rollup_operations.ml b/src/proto_alpha/lib_protocol/sc_rollup_operations.ml
index 342d6c17050a081e80f4b73bcb3ddae0365a97d9..e234e8c51057d5d8c2c70e93be2a28ba510b3243 100644
--- a/src/proto_alpha/lib_protocol/sc_rollup_operations.ml
+++ b/src/proto_alpha/lib_protocol/sc_rollup_operations.ml
@@ -264,12 +264,7 @@ let originate ctxt ~kind ~boot_sector ~origination_proof ~parameters_ty =
       ~origination_level:(Level.current ctxt).level
   in
   let+ address, size, genesis_commitment_hash, ctxt =
-    Sc_rollup.originate
-      ctxt
-      ~kind
-      ~boot_sector
-      ~parameters_ty
-      ~genesis_commitment
+    Sc_rollup.originate ctxt ~kind ~parameters_ty ~genesis_commitment
   in
   ({address; size; genesis_commitment_hash}, ctxt)
 
diff --git a/src/proto_alpha/lib_protocol/sc_rollup_storage.ml b/src/proto_alpha/lib_protocol/sc_rollup_storage.ml
index 6d31fd7d9e90ea78a96a59ffb903ee1def1156b3..eb09ba5511623eb9c5d1c682bddf1bb7bf0a81dd 100644
--- a/src/proto_alpha/lib_protocol/sc_rollup_storage.ml
+++ b/src/proto_alpha/lib_protocol/sc_rollup_storage.ml
@@ -47,7 +47,7 @@ let address_from_nonce ctxt nonce =
       in
       (ctxt, Sc_rollup_repr.Address.hash_bytes [nonce_bytes])
 
-let originate ctxt ~kind ~boot_sector ~parameters_ty ~genesis_commitment =
+let originate ctxt ~kind ~parameters_ty ~genesis_commitment =
   let open Lwt_result_syntax in
   let*? ctxt, genesis_commitment_hash =
     Sc_rollup_commitment_storage.hash ctxt genesis_commitment
@@ -64,9 +64,6 @@ let originate ctxt ~kind ~boot_sector ~parameters_ty ~genesis_commitment =
       address
       {commitment_hash = genesis_commitment_hash; level = origination_level}
   in
-  let* ctxt, boot_sector_size, _sector_existed =
-    Store.Boot_sector.add ctxt address boot_sector
-  in
   let* ctxt, param_ty_size_diff, _added =
     Store.Parameters_type.add ctxt address parameters_ty
   in
@@ -107,8 +104,8 @@ let originate ctxt ~kind ~boot_sector ~parameters_ty ~genesis_commitment =
   let origination_size = Constants_storage.sc_rollup_origination_size ctxt in
   let size =
     Z.of_int
-      (origination_size + stored_kind_size + boot_sector_size + addresses_size
-     + lcc_size_diff + commitment_size_diff + commitment_added_size_diff
+      (origination_size + stored_kind_size + addresses_size + lcc_size_diff
+     + commitment_size_diff + commitment_added_size_diff
      + commitment_staker_count_size_diff + stakers_size_diff
      + param_ty_size_diff + pvm_kind_size + genesis_info_size)
   in
@@ -141,13 +138,6 @@ let get_metadata ctxt rollup =
   in
   return (ctxt, metadata)
 
-let get_boot_sector ctxt rollup =
-  let open Lwt_result_syntax in
-  let* ctxt, boot_sector = Storage.Sc_rollup.Boot_sector.find ctxt rollup in
-  match boot_sector with
-  | None -> tzfail (Sc_rollup_does_not_exist rollup)
-  | Some boot_sector -> return (ctxt, boot_sector)
-
 let parameters_type ctxt rollup =
   let open Lwt_result_syntax in
   let+ ctxt, res = Store.Parameters_type.find ctxt rollup in
diff --git a/src/proto_alpha/lib_protocol/sc_rollup_storage.mli b/src/proto_alpha/lib_protocol/sc_rollup_storage.mli
index 074330470ab8900b7d661441328f96c3c2ddcfb3..197ca0b646089970399e4d997ab0a2b0773a221f 100644
--- a/src/proto_alpha/lib_protocol/sc_rollup_storage.mli
+++ b/src/proto_alpha/lib_protocol/sc_rollup_storage.mli
@@ -24,17 +24,16 @@
 (*                                                                           *)
 (*****************************************************************************)
 
-(** [originate context ~kind ~boot_sector] produces an address [a] for
-   a smart contract rollup using the origination nonce found in
+(** [originate context ~kind ~parameters_ty ~genesis_commitment] produces an
+   address [a] for a smart contract rollup using the origination nonce found in
    [context]. This function also initializes the storage with a new
    entry indexed by [a] to remember the [kind] of the rollup at
-   address [a] and also to remember its [boot_sector].
+   address [a].
 
    Also returns the number of allocated bytes.  *)
 val originate :
   Raw_context.t ->
   kind:Sc_rollups.Kind.t ->
-  boot_sector:string ->
   parameters_ty:Script_repr.lazy_expr ->
   genesis_commitment:Sc_rollup_commitment_repr.t ->
   (Sc_rollup_repr.Address.t
@@ -71,10 +70,6 @@ val get_metadata :
   Sc_rollup_repr.t ->
   (Raw_context.t * Sc_rollup_metadata_repr.t) tzresult Lwt.t
 
-(** [get_boot_sector ctxt sc_rollup] retrieves the boot sector for [sc_rollup]. *)
-val get_boot_sector :
-  Raw_context.t -> Sc_rollup_repr.t -> (Raw_context.t * string) tzresult Lwt.t
-
 (** [parameters_type ctxt rollup] returns the registered type of a rollup.
     Returns [None] in case there is no registered type for the rollup. *)
 val parameters_type :
diff --git a/src/proto_alpha/lib_protocol/storage.ml b/src/proto_alpha/lib_protocol/storage.ml
index aa2ea0c7fad8925249183c0fa52cd70960f3ad96..fed23a171b4b1bbae20c271e7f3daf9aec09f62b 100644
--- a/src/proto_alpha/lib_protocol/storage.ml
+++ b/src/proto_alpha/lib_protocol/storage.ml
@@ -1660,18 +1660,6 @@ module Sc_rollup = struct
         let encoding = Sc_rollups.Kind.encoding
       end)
 
-  module Boot_sector =
-    Indexed_context.Make_carbonated_map
-      (Registered)
-      (struct
-        let name = ["boot_sector"]
-      end)
-      (struct
-        type t = string
-
-        let encoding = Data_encoding.string
-      end)
-
   module Parameters_type =
     Indexed_context.Make_carbonated_map
       (Registered)
diff --git a/src/proto_alpha/lib_protocol/storage.mli b/src/proto_alpha/lib_protocol/storage.mli
index 853e49bcab5454b02d54c324ebf57036ecde6641..7e6bc25c3acdda05612cd28d4ed7335b6f96ca10 100644
--- a/src/proto_alpha/lib_protocol/storage.mli
+++ b/src/proto_alpha/lib_protocol/storage.mli
@@ -739,12 +739,6 @@ module Sc_rollup : sig
        and type value = Sc_rollups.Kind.t
        and type t := Raw_context.t
 
-  module Boot_sector :
-    Non_iterable_indexed_carbonated_data_storage
-      with type key = Sc_rollup_repr.t
-       and type value = string
-       and type t := Raw_context.t
-
   module Parameters_type :
     Non_iterable_indexed_carbonated_data_storage
       with type key = Sc_rollup_repr.t
diff --git a/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_storage.ml b/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_storage.ml
index c92ee7e68e7f1bfbb5ece52287149e2dc5d66946..53e9529c7929ab77c5a069dbb4e165f0922b21c1 100644
--- a/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_storage.ml
+++ b/src/proto_alpha/lib_protocol/test/unit/test_sc_rollup_storage.ml
@@ -104,12 +104,7 @@ let new_sc_rollup ctxt =
         ~origination_level:(Raw_context.current_level ctxt).level
         kind
     in
-    Sc_rollup_storage.originate
-      ctxt
-      ~kind
-      ~boot_sector
-      ~parameters_ty
-      ~genesis_commitment
+    Sc_rollup_storage.originate ctxt ~kind ~parameters_ty ~genesis_commitment
   in
   (rollup, genesis_hash, ctxt)
 
diff --git a/tezt/lib_tezos/RPC.ml b/tezt/lib_tezos/RPC.ml
index e2493db65eb05f0379e878a8670d43108a35221a..b5baf21c0ba3328b1c46fcc5f93b4d2c61926b5f 100644
--- a/tezt/lib_tezos/RPC.ml
+++ b/tezt/lib_tezos/RPC.ml
@@ -774,23 +774,6 @@ let get_chain_block_context_sc_rollups_sc_rollup_genesis_info ?(chain = "main")
     ]
     Fun.id
 
-let get_chain_block_context_sc_rollups_sc_rollup_boot_sector ?(chain = "main")
-    ?(block = "head") sc_rollup =
-  make
-    GET
-    [
-      "chains";
-      chain;
-      "blocks";
-      block;
-      "context";
-      "sc_rollups";
-      "sc_rollup";
-      sc_rollup;
-      "boot_sector";
-    ]
-    Fun.id
-
 let get_chain_block_context_sc_rollups_sc_rollup_stakers_commitments
     ?(chain = "main") ?(block = "head") sc_rollup =
   make
diff --git a/tezt/lib_tezos/RPC.mli b/tezt/lib_tezos/RPC.mli
index 572e5dab538ee7596c5f19c9236b0645b3413301..c6b1af1d62eb7c2f5f5678f918bf0db0370c66ee 100644
--- a/tezt/lib_tezos/RPC.mli
+++ b/tezt/lib_tezos/RPC.mli
@@ -766,10 +766,6 @@ val get_chain_block_context_sc_rollups_all_inbox :
 val get_chain_block_context_sc_rollups_sc_rollup_genesis_info :
   ?chain:string -> ?block:string -> string -> JSON.t t
 
-(** RPC: [GET chains/<chain>/blocks/<block>/context/sc_rollups/sc_rollup/<sc_rollup_address>/boot_sector] *)
-val get_chain_block_context_sc_rollups_sc_rollup_boot_sector :
-  ?chain:string -> ?block:string -> string -> JSON.t t
-
 (** RPC: [GET chains/<chain>/blocks/<block>/context/sc_rollups/sc_rollup/<sc_rollup_address>/stakers_commitments] *)
 val get_chain_block_context_sc_rollups_sc_rollup_stakers_commitments :
   ?chain:string -> ?block:string -> string -> JSON.t t
diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing data availability layer functionality  (feature_flag_is_disabled).out b/tezt/tests/expected/dal.ml/Alpha- Testing data availability layer functionality  (feature_flag_is_disabled).out
index 48bc70e9a1142daac2f5e56ff3a862b571776d97..d973460ab5a060238527d0fad42f6d848f6b025f 100644
--- a/tezt/tests/expected/dal.ml/Alpha- Testing data availability layer functionality  (feature_flag_is_disabled).out	
+++ b/tezt/tests/expected/dal.ml/Alpha- Testing data availability layer functionality  (feature_flag_is_disabled).out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with  --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2909.925 units (will add 100 for safety)
-Estimated storage: 6524 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,23 +12,23 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000649
+    Fee to the baker: ꜩ0.000629
     Expected counter: 1
-    Gas limit: 3010
-    Storage limit: 6544 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000629
+      payload fees(the block proposer) ....... +ꜩ0.000629
     Smart contract rollup origination:
       Kind: arith
       Parameter type: unit
       Boot sector Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2909.925
-      Storage size: 6524 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.631
-        storage fees ........................... +ꜩ1.631
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing rollup and Data availability layer node (dac_handles_reveal_data).out b/tezt/tests/expected/dal.ml/Alpha- Testing rollup and Data availability layer node (dac_handles_reveal_data).out
index 48bc70e9a1142daac2f5e56ff3a862b571776d97..d973460ab5a060238527d0fad42f6d848f6b025f 100644
--- a/tezt/tests/expected/dal.ml/Alpha- Testing rollup and Data availability layer node (dac_handles_reveal_data).out	
+++ b/tezt/tests/expected/dal.ml/Alpha- Testing rollup and Data availability layer node (dac_handles_reveal_data).out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with  --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2909.925 units (will add 100 for safety)
-Estimated storage: 6524 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,23 +12,23 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000649
+    Fee to the baker: ꜩ0.000629
     Expected counter: 1
-    Gas limit: 3010
-    Storage limit: 6544 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000629
+      payload fees(the block proposer) ....... +ꜩ0.000629
     Smart contract rollup origination:
       Kind: arith
       Parameter type: unit
       Boot sector Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2909.925
-      Storage size: 6524 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.631
-        storage fees ........................... +ꜩ1.631
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing rollup and Data availability layer node (rollup_node_applies_dal_.out b/tezt/tests/expected/dal.ml/Alpha- Testing rollup and Data availability layer node (rollup_node_applies_dal_.out
index 7c8dd621b96a8cb4154f89d1325437fc8848cf21..9f306f0e229724fc4c08c0ba09776a74980c00d5 100644
--- a/tezt/tests/expected/dal.ml/Alpha- Testing rollup and Data availability layer node (rollup_node_applies_dal_.out	
+++ b/tezt/tests/expected/dal.ml/Alpha- Testing rollup and Data availability layer node (rollup_node_applies_dal_.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with  --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2909.925 units (will add 100 for safety)
-Estimated storage: 6524 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,25 +12,25 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000649
+    Fee to the baker: ꜩ0.000629
     Expected counter: 1
-    Gas limit: 3010
-    Storage limit: 6544 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000629
+      payload fees(the block proposer) ....... +ꜩ0.000629
     Smart contract rollup origination:
       Kind: arith
       Parameter type: unit
       Boot sector Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2909.925
-      Storage size: 6524 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.631
-        storage fees ........................... +ꜩ1.631
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
 
 ./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SC_ROLLUP_HASH]/genesis_info'
diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing rollup and Data availability layer node (rollup_node_downloads_sl.out b/tezt/tests/expected/dal.ml/Alpha- Testing rollup and Data availability layer node (rollup_node_downloads_sl.out
index 83c98f8b557696d4e9b16dbf2666239c7e038da6..a19e0d405cd7e49c4ed6f61df021ba6e29025024 100644
--- a/tezt/tests/expected/dal.ml/Alpha- Testing rollup and Data availability layer node (rollup_node_downloads_sl.out	
+++ b/tezt/tests/expected/dal.ml/Alpha- Testing rollup and Data availability layer node (rollup_node_downloads_sl.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type unit booting with  --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2909.925 units (will add 100 for safety)
-Estimated storage: 6524 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,25 +12,25 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000649
+    Fee to the baker: ꜩ0.000629
     Expected counter: 1
-    Gas limit: 3010
-    Storage limit: 6544 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000629
+      payload fees(the block proposer) ....... +ꜩ0.000629
     Smart contract rollup origination:
       Kind: arith
       Parameter type: unit
       Boot sector Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2909.925
-      Storage size: 6524 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.631
-        storage fees ........................... +ꜩ1.631
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
 
 ./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SC_ROLLUP_HASH]/genesis_info'
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out
index efe01eba70bd05fce0e96b48176f2715a6982a44..c7729859b6ee261f30a76c3f767bfc1975360783 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type string booting with  --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2909.925 units (will add 100 for safety)
-Estimated storage: 6524 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,25 +12,25 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000649
+    Fee to the baker: ꜩ0.000629
     Expected counter: 1
-    Gas limit: 3010
-    Storage limit: 6544 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000629
+      payload fees(the block proposer) ....... +ꜩ0.000629
     Smart contract rollup origination:
       Kind: arith
       Parameter type: string
       Boot sector Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2909.925
-      Storage size: 6524 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.631
-        storage fees ........................... +ꜩ1.631
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
 
 ./octez-sc-rollup-client-alpha rpc get /global/sc_rollup_address
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (entrypoint- -aux- earline.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (entrypoint- -aux- earline.out
index 42fe0fdf18ad0c304d2ddeb25004cf8e43b2a160..fc58697391a61b971f6fc59f579fb49865e701e8 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (entrypoint- -aux- earline.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (entrypoint- -aux- earline.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type string booting with  --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2909.925 units (will add 100 for safety)
-Estimated storage: 6524 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,25 +12,25 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000649
+    Fee to the baker: ꜩ0.000629
     Expected counter: 1
-    Gas limit: 3010
-    Storage limit: 6544 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000629
+      payload fees(the block proposer) ....... +ꜩ0.000629
     Smart contract rollup origination:
       Kind: arith
       Parameter type: string
       Boot sector Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2909.925
-      Storage size: 6524 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.631
-        storage fees ........................... +ꜩ1.631
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
 
 ./octez-client --wait none send sc rollup message 'text:["37 [CONTRACT_HASH]%aux"]' from bootstrap2
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (entrypoint- -default- ear.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (entrypoint- -default- ear.out
index 2cc136fabd1b50704b194147f959687e75ef5b72..c86304ed864d1edd7dc744c11a0d7d1c5fdbecfc 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (entrypoint- -default- ear.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - an outbox message should be executable (entrypoint- -default- ear.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type string booting with  --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2909.925 units (will add 100 for safety)
-Estimated storage: 6524 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,25 +12,25 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000649
+    Fee to the baker: ꜩ0.000629
     Expected counter: 1
-    Gas limit: 3010
-    Storage limit: 6544 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000629
+      payload fees(the block proposer) ....... +ꜩ0.000629
     Smart contract rollup origination:
       Kind: arith
       Parameter type: string
       Boot sector Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2909.925
-      Storage size: 6524 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.631
-        storage fees ........................... +ꜩ1.631
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
 
 ./octez-client --wait none send sc rollup message 'text:["37 [CONTRACT_HASH]"]' from bootstrap2
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out
index 7c721113f441119906408ea725adf0a2f0db4dca..f5c756d5e5d79f3abc3a4675bd2c574dd579154b 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type string booting with '10 10 10 + +' --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2909.973 units (will add 100 for safety)
-Estimated storage: 6536 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,31 +12,31 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000661
+    Fee to the baker: ꜩ0.000641
     Expected counter: 1
-    Gas limit: 3010
-    Storage limit: 6556 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000661
-      payload fees(the block proposer) ....... +ꜩ0.000661
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000641
+      payload fees(the block proposer) ....... +ꜩ0.000641
     Smart contract rollup origination:
       Kind: arith
       Parameter type: string
       Boot sector Blake2B hash: '8eb6ccf70902fcd3fa2040cf27dda202a71d85625516f22a0c9c67fc86057a7b'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2909.973
-      Storage size: 6536 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.634
-        storage fees ........................... +ꜩ1.634
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
 
 ./octez-client --wait none originate sc rollup from bootstrap2 of kind arith of type string booting with 31 --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2909.933 units (will add 100 for safety)
-Estimated storage: 6526 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -46,25 +46,25 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000651
+    Fee to the baker: ꜩ0.000631
     Expected counter: 1
-    Gas limit: 3010
-    Storage limit: 6546 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000651
-      payload fees(the block proposer) ....... +ꜩ0.000651
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000631
+      payload fees(the block proposer) ....... +ꜩ0.000631
     Smart contract rollup origination:
       Kind: arith
       Parameter type: string
       Boot sector Blake2B hash: 'b682df8c87f218dfa8151f2eaafe20e6f8d87b243f8fe63de6d49485a8bf6eea'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2909.933
-      Storage size: 6526 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.6315
-        storage fees ........................... +ꜩ1.6315
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
 
 ./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SC_ROLLUP_HASH]/genesis_info'
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out
index f29d34792007940e070c91b509075a168acab2e8..42770921f21dd8129bc0fc49d6a4615562d6a06e 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type string booting with  --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2909.925 units (will add 100 for safety)
-Estimated storage: 6524 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,25 +12,25 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000649
+    Fee to the baker: ꜩ0.000629
     Expected counter: 1
-    Gas limit: 3010
-    Storage limit: 6544 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000629
+      payload fees(the block proposer) ....... +ꜩ0.000629
     Smart contract rollup origination:
       Kind: arith
       Parameter type: string
       Boot sector Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2909.925
-      Storage size: 6524 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.631
-        storage fees ........................... +ꜩ1.631
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
 
 ./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SC_ROLLUP_HASH]/genesis_info'
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out
index 4f2f0311a49e99897e82da579a609701ca2505a0..f3b2ada5f2f569e017ebc4715329d1116173a22c 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type string booting with  --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2909.925 units (will add 100 for safety)
-Estimated storage: 6524 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,25 +12,25 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000649
+    Fee to the baker: ꜩ0.000629
     Expected counter: 1
-    Gas limit: 3010
-    Storage limit: 6544 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000629
+      payload fees(the block proposer) ....... +ꜩ0.000629
     Smart contract rollup origination:
       Kind: arith
       Parameter type: string
       Boot sector Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2909.925
-      Storage size: 6524 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.631
-        storage fees ........................... +ꜩ1.631
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
 
 ./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SC_ROLLUP_HASH]/genesis_info'
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - origination of a SCORU executes without error.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - origination of a SCORU executes without error.out
index c0e2762bcae70d790c69cd4be025b4a7e189cf36..89a13745638cf254ce4e1358454aa83abf1064fc 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - origination of a SCORU executes without error.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - origination of a SCORU executes without error.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type string booting with  --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2909.925 units (will add 100 for safety)
-Estimated storage: 6524 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,23 +12,23 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000649
+    Fee to the baker: ꜩ0.000629
     Expected counter: 1
-    Gas limit: 3010
-    Storage limit: 6544 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000629
+      payload fees(the block proposer) ....... +ꜩ0.000629
     Smart contract rollup origination:
       Kind: arith
       Parameter type: string
       Boot sector Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2909.925
-      Storage size: 6524 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.631
-        storage fees ........................... +ꜩ1.631
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out
index 26dd31e1aa7623bcbfece5687130a37872b7fea4..9d01f02ecc10a9135cee19c1b816373a8d7cb16f 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type string booting with  --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2909.925 units (will add 100 for safety)
-Estimated storage: 6524 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,25 +12,25 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.000649
+    Fee to the baker: ꜩ0.000629
     Expected counter: 1
-    Gas limit: 3010
-    Storage limit: 6544 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.000649
-      payload fees(the block proposer) ....... +ꜩ0.000649
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000629
+      payload fees(the block proposer) ....... +ꜩ0.000629
     Smart contract rollup origination:
       Kind: arith
       Parameter type: string
       Boot sector Blake2B hash: '0e5751c026e543b2e8ab2eb06099daa1d1e5df47778f7787faab45cdf12fe3a8'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2909.925
-      Storage size: 6524 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.631
-        storage fees ........................... +ꜩ1.631
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
 
 ./octez-client --wait none publish commitment from '[PUBLIC_KEY_HASH]' for sc rollup '[SC_ROLLUP_HASH]' with compressed state '[SC_ROLLUP_PVM_STATE_HASH]' at inbox level 4 and predecessor '[SC_ROLLUP_COMMITMENT_HASH]' and number of ticks 1
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out
index bfb8230d0c855aa2d6c88b3d1f952bd1ff850c1c..966d67dcbd02eb4b49eba679060b934e0a76c749 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type string booting with 0061736d0100000001240660047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060027f7f00600000025e0310726f6c6c75705f736166655f636f72650a726561645f696e707574000010726f6c6c75705f736166655f636f72650c77726974655f6f7574707574000110726f6c6c75705f736166655f636f72650b73746f72655f777269746500020304030304050503010001071502036d656d02000b6b65726e656c5f6e65787400050a76032a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b2801027f41fd002d0000210220002d0000210320032002460440200041016a200141016b10011a0b0b2001017f41dc0141f00141840241901c100021004184022000100441840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fd000b0101 --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2911.341 units (will add 100 for safety)
-Estimated storage: 6878 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,25 +12,25 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00101
+    Fee to the baker: ꜩ0.000989
     Expected counter: 1
-    Gas limit: 3012
-    Storage limit: 6898 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00101
-      payload fees(the block proposer) ....... +ꜩ0.00101
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000989
+      payload fees(the block proposer) ....... +ꜩ0.000989
     Smart contract rollup origination:
       Kind: wasm_2_0_0
       Parameter type: string
       Boot sector Blake2B hash: 'cd21483a93a238aad0f696ca1a754735f4126d609308c93039463918ad37444b'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2911.341
-      Storage size: 6878 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.7195
-        storage fees ........................... +ꜩ1.7195
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
 
 ./octez-sc-rollup-client-alpha rpc get /global/sc_rollup_address
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (entrypoint- -aux- ea.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (entrypoint- -aux- ea.out
index 081b04ee70871b7b4dfc7a7776cbd4a14ae13cc8..285f6c9a66cb9cf77d7b4140d00e23d00cde3185 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (entrypoint- -aux- ea.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (entrypoint- -aux- ea.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type string booting with 0061736d0100000001240660047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060027f7f00600000025e0310726f6c6c75705f736166655f636f72650a726561645f696e707574000010726f6c6c75705f736166655f636f72650c77726974655f6f7574707574000110726f6c6c75705f736166655f636f72650b73746f72655f777269746500020304030304050503010001071502036d656d02000b6b65726e656c5f6e65787400050a76032a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b2801027f41fd002d0000210220002d0000210320032002460440200041016a200141016b10011a0b0b2001017f41dc0141f00141840241901c100021004184022000100441840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fd000b0101 --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2911.341 units (will add 100 for safety)
-Estimated storage: 6878 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,23 +12,23 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00101
+    Fee to the baker: ꜩ0.000989
     Expected counter: 1
-    Gas limit: 3012
-    Storage limit: 6898 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00101
-      payload fees(the block proposer) ....... +ꜩ0.00101
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000989
+      payload fees(the block proposer) ....... +ꜩ0.000989
     Smart contract rollup origination:
       Kind: wasm_2_0_0
       Parameter type: string
       Boot sector Blake2B hash: 'cd21483a93a238aad0f696ca1a754735f4126d609308c93039463918ad37444b'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2911.341
-      Storage size: 6878 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.7195
-        storage fees ........................... +ꜩ1.7195
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (entrypoint- -default.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (entrypoint- -default.out
index 081b04ee70871b7b4dfc7a7776cbd4a14ae13cc8..285f6c9a66cb9cf77d7b4140d00e23d00cde3185 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (entrypoint- -default.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - an outbox message should be executable (entrypoint- -default.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type string booting with 0061736d0100000001240660047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060027f7f00600000025e0310726f6c6c75705f736166655f636f72650a726561645f696e707574000010726f6c6c75705f736166655f636f72650c77726974655f6f7574707574000110726f6c6c75705f736166655f636f72650b73746f72655f777269746500020304030304050503010001071502036d656d02000b6b65726e656c5f6e65787400050a76032a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b2801027f41fd002d0000210220002d0000210320032002460440200041016a200141016b10011a0b0b2001017f41dc0141f00141840241901c100021004184022000100441840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fd000b0101 --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2911.341 units (will add 100 for safety)
-Estimated storage: 6878 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,23 +12,23 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00101
+    Fee to the baker: ꜩ0.000989
     Expected counter: 1
-    Gas limit: 3012
-    Storage limit: 6898 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00101
-      payload fees(the block proposer) ....... +ꜩ0.00101
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000989
+      payload fees(the block proposer) ....... +ꜩ0.000989
     Smart contract rollup origination:
       Kind: wasm_2_0_0
       Parameter type: string
       Boot sector Blake2B hash: 'cd21483a93a238aad0f696ca1a754735f4126d609308c93039463918ad37444b'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2911.341
-      Storage size: 6878 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.7195
-        storage fees ........................... +ꜩ1.7195
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out
index f45c7006b0e57dc7c9ed8cb6bc8ea03f7ce54623..4bc3a63698e86e8452c39b9b70f88c42551b6b3e 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type string booting with 0061736d0100000001240660047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060027f7f00600000025e0310726f6c6c75705f736166655f636f72650a726561645f696e707574000010726f6c6c75705f736166655f636f72650c77726974655f6f7574707574000110726f6c6c75705f736166655f636f72650b73746f72655f777269746500020304030304050503010001071502036d656d02000b6b65726e656c5f6e65787400050a76032a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b2801027f41fd002d0000210220002d0000210320032002460440200041016a200141016b10011a0b0b2001017f41dc0141f00141840241901c100021004184022000100441840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fd000b0101 --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2911.341 units (will add 100 for safety)
-Estimated storage: 6878 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,25 +12,25 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00101
+    Fee to the baker: ꜩ0.000989
     Expected counter: 1
-    Gas limit: 3012
-    Storage limit: 6898 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00101
-      payload fees(the block proposer) ....... +ꜩ0.00101
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000989
+      payload fees(the block proposer) ....... +ꜩ0.000989
     Smart contract rollup origination:
       Kind: wasm_2_0_0
       Parameter type: string
       Boot sector Blake2B hash: 'cd21483a93a238aad0f696ca1a754735f4126d609308c93039463918ad37444b'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2911.341
-      Storage size: 6878 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.7195
-        storage fees ........................... +ꜩ1.7195
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
 
 ./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SC_ROLLUP_HASH]/genesis_info'
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out
index 798f473041b74636252a9ebe6579a1d89e0fa664..1da514f54b1ad9783e8934942b423f11739bec2d 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type string booting with 0061736d0100000001240660047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060027f7f00600000025e0310726f6c6c75705f736166655f636f72650a726561645f696e707574000010726f6c6c75705f736166655f636f72650c77726974655f6f7574707574000110726f6c6c75705f736166655f636f72650b73746f72655f777269746500020304030304050503010001071502036d656d02000b6b65726e656c5f6e65787400050a76032a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b2801027f41fd002d0000210220002d0000210320032002460440200041016a200141016b10011a0b0b2001017f41dc0141f00141840241901c100021004184022000100441840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fd000b0101 --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2911.341 units (will add 100 for safety)
-Estimated storage: 6878 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,25 +12,25 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00101
+    Fee to the baker: ꜩ0.000989
     Expected counter: 1
-    Gas limit: 3012
-    Storage limit: 6898 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00101
-      payload fees(the block proposer) ....... +ꜩ0.00101
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000989
+      payload fees(the block proposer) ....... +ꜩ0.000989
     Smart contract rollup origination:
       Kind: wasm_2_0_0
       Parameter type: string
       Boot sector Blake2B hash: 'cd21483a93a238aad0f696ca1a754735f4126d609308c93039463918ad37444b'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2911.341
-      Storage size: 6878 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.7195
-        storage fees ........................... +ꜩ1.7195
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
 
 ./octez-client rpc get '/chains/main/blocks/head/context/sc_rollups/sc_rollup/[SC_ROLLUP_HASH]/genesis_info'
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out
index 081b04ee70871b7b4dfc7a7776cbd4a14ae13cc8..285f6c9a66cb9cf77d7b4140d00e23d00cde3185 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out	
@@ -1,8 +1,8 @@
 
 ./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type string booting with 0061736d0100000001240660047f7f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060027f7f00600000025e0310726f6c6c75705f736166655f636f72650a726561645f696e707574000010726f6c6c75705f736166655f636f72650c77726974655f6f7574707574000110726f6c6c75705f736166655f636f72650b73746f72655f777269746500020304030304050503010001071502036d656d02000b6b65726e656c5f6e65787400050a76032a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b2801027f41fd002d0000210220002d0000210320032002460440200041016a200141016b10011a0b0b2001017f41dc0141f00141840241901c100021004184022000100441840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fd000b0101 --burn-cap 9999999
 Node is bootstrapped.
-Estimated gas: 2911.341 units (will add 100 for safety)
-Estimated storage: 6878 bytes added (will add 20 for safety)
+Estimated gas: 2709.909 units (will add 100 for safety)
+Estimated storage: 6520 bytes added (will add 20 for safety)
 Operation successfully injected in the node.
 Operation hash is '[OPERATION_HASH]'
 NOT waiting for the operation to be included.
@@ -12,23 +12,23 @@ and/or an external block explorer to make sure that it has been included.
 This sequence of operations was run:
   Manager signed operations:
     From: [PUBLIC_KEY_HASH]
-    Fee to the baker: ꜩ0.00101
+    Fee to the baker: ꜩ0.000989
     Expected counter: 1
-    Gas limit: 3012
-    Storage limit: 6898 bytes
+    Gas limit: 2810
+    Storage limit: 6540 bytes
     Balance updates:
-      [PUBLIC_KEY_HASH] ... -ꜩ0.00101
-      payload fees(the block proposer) ....... +ꜩ0.00101
+      [PUBLIC_KEY_HASH] ... -ꜩ0.000989
+      payload fees(the block proposer) ....... +ꜩ0.000989
     Smart contract rollup origination:
       Kind: wasm_2_0_0
       Parameter type: string
       Boot sector Blake2B hash: 'cd21483a93a238aad0f696ca1a754735f4126d609308c93039463918ad37444b'
       This smart contract rollup origination was successfully applied
-      Consumed gas: 2911.341
-      Storage size: 6878 bytes
+      Consumed gas: 2709.909
+      Storage size: 6520 bytes
       Address: [SC_ROLLUP_HASH]
       Genesis commitment hash: [SC_ROLLUP_COMMITMENT_HASH]
       Balance updates:
-        [PUBLIC_KEY_HASH] ... -ꜩ1.7195
-        storage fees ........................... +ꜩ1.7195
+        [PUBLIC_KEY_HASH] ... -ꜩ1.63
+        storage fees ........................... +ꜩ1.63
 
diff --git a/tezt/tests/sc_rollup.ml b/tezt/tests/sc_rollup.ml
index 8099efaf2173fadfbbbf298e74ba640afb1e4f32..2bf5f087b20631788ee7c8ef3eb10d4beac35b20 100644
--- a/tezt/tests/sc_rollup.ml
+++ b/tezt/tests/sc_rollup.ml
@@ -2046,7 +2046,8 @@ let test_reinject_failed_commitment ~kind =
 (* Check that the SC rollup is correctly originated with a boot sector.
    -------------------------------------------------------
 
-   Originate a rollup with a custom boot sector and check if the RPC returns it.
+   Originate a rollup with a custom boot sector and check if the rollup's
+   genesis state hash is correct.
 *)
 let test_rollup_origination_boot_sector ~boot_sector ~kind =
   test_full_scenario
@@ -2058,11 +2059,6 @@ let test_rollup_origination_boot_sector ~boot_sector ~kind =
       description = "boot_sector is correctly set";
     }
   @@ fun rollup_node rollup_client sc_rollup _tezos_node tezos_client ->
-  let* client_boot_sector =
-    RPC.Client.call ~hooks tezos_client
-    @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_boot_sector sc_rollup
-  in
-  let client_boot_sector = JSON.as_string client_boot_sector in
   let* genesis_info =
     RPC.Client.call ~hooks tezos_client
     @@ RPC.get_chain_block_context_sc_rollups_sc_rollup_genesis_info sc_rollup
@@ -2086,10 +2082,7 @@ let test_rollup_origination_boot_sector ~boot_sector ~kind =
     (init_hash = node_state_hash)
       string
       ~error_msg:"State hashes should be equal! (%L, %R)") ;
-  Check.(boot_sector = client_boot_sector)
-    Check.string
-    ~error_msg:"expected value %L, got %R"
-  |> return
+  unit
 
 (** Check that a node makes use of the boot sector.
     -------------------------------------------------------