diff --git a/etc/env/base/chain.toml b/etc/env/base/chain.toml
index a47c5c498d2..d8c460dd40d 100644
--- a/etc/env/base/chain.toml
+++ b/etc/env/base/chain.toml
@@ -52,25 +52,21 @@ minimal_l2_gas_price=100000000
 # The constant that represents the possibility that a batch can be sealed because of overuse of computation resources.
 # It has range from 0 to 1. If it is 0, the compute will not depend on the cost for closing the batch.
 # If it is 1, the gas limit per batch will have to cover the entire cost of closing the batch.
-# compute_overhead_part=0.0
-compute_overhead_part=1.0
+compute_overhead_part=0.0
 
 # The constant that represents the possibility that a batch can be sealed because of overuse of pubdata.
 # It has range from 0 to 1. If it is 0, the pubdata will not depend on the cost for closing the batch.
 # If it is 1, the pubdata limit per batch will have to cover the entire cost of closing the batch.
-# pubdata_overhead_part=1.0
-pubdata_overhead_part=0
+pubdata_overhead_part=1.0
 
 # The constant amount of L1 gas that is used as the overhead for the batch. It includes the price for batch verification, etc.
-# batch_overhead_l1_gas=800000
-batch_overhead_l1_gas=1000000
+batch_overhead_l1_gas=800000
 
 # The maximum amount of gas that can be used by the batch. This value is derived from the circuits limitation per batch.
 max_gas_per_batch=200000000
 
 # The maximum amount of pubdata that can be used by the batch. Note that if the calldata is used as pubdata, this variable should not exceed 128kb.
-# max_pubdata_per_batch=100000
-max_pubdata_per_batch=1000000000000
+max_pubdata_per_batch=100000
 
 # The version of the fee model to use. 
 # - `V1`, the first model that was used in zkSync Era. In this fee model, the pubdata price must be pegged to the L1 gas price.
@@ -93,7 +89,7 @@ virtual_blocks_per_miniblock=1
 # This variable should not be set to true in any customer facing environment.
 upload_witness_inputs_to_gcs=false
 
-l1_batch_commit_data_generator_mode="Validium"
+l1_batch_commit_data_generator_mode="Rollup"
 
 [chain.operations_manager]
 # Sleep time when there is no new input data
diff --git a/etc/env/base/eth_sender.toml b/etc/env/base/eth_sender.toml
index fafeb079d82..b09271a59d5 100644
--- a/etc/env/base/eth_sender.toml
+++ b/etc/env/base/eth_sender.toml
@@ -62,4 +62,4 @@ pricing_formula_parameter_b=1.0005
 internal_l1_pricing_multiplier=0.8
 # Node polling period in seconds.
 poll_period=5
-l1_gas_per_pubdata_byte=0
+l1_gas_per_pubdata_byte=17