diff --git a/src/el/el_launcher.star b/src/el/el_launcher.star
index 05febb0e5..5a2e69f82 100644
--- a/src/el/el_launcher.star
+++ b/src/el/el_launcher.star
@@ -33,7 +33,6 @@ def launch(
                 el_cl_data,
                 jwt_file,
                 network_id,
-                el_cl_data.prague_time,
             ),
             "launch_method": geth.launch,
         },
@@ -49,7 +48,6 @@ def launch(
                 el_cl_data,
                 jwt_file,
                 network_id,
-                el_cl_data.prague_time,
             ),
             "launch_method": erigon.launch,
         },
diff --git a/src/el/erigon/erigon_launcher.star b/src/el/erigon/erigon_launcher.star
index b98436604..b31e31db2 100644
--- a/src/el/erigon/erigon_launcher.star
+++ b/src/el/erigon/erigon_launcher.star
@@ -158,11 +158,6 @@ def get_config(
 
     cmd = [
         "erigon",
-        "{0}".format(
-            "--override.prague=" + str(launcher.prague_time)
-            if constants.NETWORK_NAME.shadowfork in network_params.network
-            else ""
-        ),
         "--networkid={0}".format(launcher.networkid),
         "--log.console.verbosity=" + log_level,
         "--datadir=" + EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
@@ -190,6 +185,10 @@ def get_config(
     if network_params.gas_limit > 0:
         cmd.append("--miner.gaslimit={0}".format(network_params.gas_limit))
 
+    if constants.NETWORK_NAME.shadowfork in network_params.network:  # shadowfork
+        if launcher.osaka_enabled:
+            cmd.append("--override.osaka=" + str(launcher.osaka_time))
+
     files = {
         constants.GENESIS_DATA_MOUNTPOINT_ON_CLIENTS: launcher.el_cl_genesis_data.files_artifact_uuid,
         constants.JWT_MOUNTPOINT_ON_CLIENTS: launcher.jwt_file,
@@ -286,10 +285,11 @@ def get_config(
     return ServiceConfig(**config_args)
 
 
-def new_erigon_launcher(el_cl_genesis_data, jwt_file, networkid, prague_time):
+def new_erigon_launcher(el_cl_genesis_data, jwt_file, networkid):
     return struct(
         el_cl_genesis_data=el_cl_genesis_data,
         jwt_file=jwt_file,
         networkid=networkid,
-        prague_time=prague_time,
+        osaka_time=el_cl_genesis_data.osaka_time,
+        osaka_enabled=el_cl_genesis_data.osaka_enabled,
     )
diff --git a/src/el/geth/geth_launcher.star b/src/el/geth/geth_launcher.star
index 2b7124694..350685f7e 100644
--- a/src/el/geth/geth_launcher.star
+++ b/src/el/geth/geth_launcher.star
@@ -264,8 +264,8 @@ def get_config(
                 )
             )
         if constants.NETWORK_NAME.shadowfork in network_params.network:  # shadowfork
-            if launcher.prague_time:
-                cmd.append("--override.prague=" + str(launcher.prague_time))
+            if launcher.osaka_enabled:
+                cmd.append("--override.osaka=" + str(launcher.osaka_time))
 
     elif (
         network_params.network not in constants.PUBLIC_NETWORKS
@@ -346,11 +346,11 @@ def new_geth_launcher(
     el_cl_genesis_data,
     jwt_file,
     networkid,
-    prague_time,
 ):
     return struct(
         el_cl_genesis_data=el_cl_genesis_data,
         jwt_file=jwt_file,
         networkid=networkid,
-        prague_time=prague_time,
+        osaka_time=el_cl_genesis_data.osaka_time,
+        osaka_enabled=el_cl_genesis_data.osaka_enabled,
     )
diff --git a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_data.star b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_data.star
index e6b850748..c750ed114 100644
--- a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_data.star
+++ b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_data.star
@@ -1,12 +1,12 @@
 def new_el_cl_genesis_data(
     files_artifact_uuid,
     genesis_validators_root,
-    prague_time=0,
     osaka_time=0,
+    osaka_enabled=False,
 ):
     return struct(
         files_artifact_uuid=files_artifact_uuid,
         genesis_validators_root=genesis_validators_root,
-        prague_time=prague_time,
         osaka_time=osaka_time,
+        osaka_enabled=osaka_enabled,
     )
diff --git a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star
index 5796f918a..f5ccb12d1 100644
--- a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star
+++ b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star
@@ -84,26 +84,25 @@ def generate_el_cl_genesis_data(
         files={"/data": genesis.files_artifacts[1]},
         wait=None,
     )
-
-    prague_time = plan.run_sh(
-        name="read-prague-time",
-        description="Reading prague time from genesis",
-        run="jq .config.pragueTime /data/genesis.json | tr -d '\n'",
-        files={"/data": genesis.files_artifacts[0]},
-    )
-
     osaka_time = plan.run_sh(
         name="read-osaka-time",
         description="Reading osaka time from genesis",
-        run="jq .config.osakaTime /data/genesis.json | tr -d '\n'",
+        run="jq '.config.osakaTime' /data/genesis.json | tr -d '\n'",
+        files={"/data": genesis.files_artifacts[0]},
+    )
+
+    osaka_enabled_check = plan.run_sh(
+        name="check-osaka-enabled",
+        description="Check if osaka time is enabled (not false)",
+        run="test \"$(jq '.config.osakaTime // false' /data/genesis.json | tr -d '\n')\" != \"false\" && echo true || echo false",
         files={"/data": genesis.files_artifacts[0]},
     )
 
     result = el_cl_genesis_data.new_el_cl_genesis_data(
         genesis.files_artifacts[0],
         genesis_validators_root.output,
-        prague_time.output,
         osaka_time.output,
+        osaka_enabled_check.output == "true",
     )
 
     return result