diff --git a/crates/humanode-peer/src/service/mod.rs b/crates/humanode-peer/src/service/mod.rs
index 61d7953e3..5a3e00fd1 100644
--- a/crates/humanode-peer/src/service/mod.rs
+++ b/crates/humanode-peer/src/service/mod.rs
@@ -74,12 +74,7 @@ type FrontierBackend = fc_db::Backend<Block>;
 pub fn keystore_container(
     config: &Configuration,
 ) -> Result<(KeystoreContainer, TaskManager), ServiceError> {
-    let executor = Executor::new(
-        config.substrate.wasm_method,
-        config.substrate.default_heap_pages,
-        config.substrate.max_runtime_instances,
-        config.substrate.runtime_cache_size,
-    );
+    let executor = sc_service::new_native_or_wasm_executor::<ExecutorDispatch>(&config.substrate);
 
     let (_client, _backend, keystore_container, task_manager) =
         sc_service::new_full_parts::<Block, RuntimeApi, _>(&config.substrate, None, executor)?;
@@ -126,12 +121,7 @@ pub async fn new_partial(
         })
         .transpose()?;
 
-    let executor = Executor::new(
-        config.wasm_method,
-        config.default_heap_pages,
-        config.max_runtime_instances,
-        config.runtime_cache_size,
-    );
+    let executor = sc_service::new_native_or_wasm_executor(&config);
 
     let (client, backend, keystore_container, task_manager) =
         sc_service::new_full_parts::<Block, RuntimeApi, _>(