diff --git a/node-runner-cli/config/CoreDockerConfig.py b/node-runner-cli/config/CoreDockerConfig.py
index 5d8f5692..10d570c6 100644
--- a/node-runner-cli/config/CoreDockerConfig.py
+++ b/node-runner-cli/config/CoreDockerConfig.py
@@ -22,7 +22,7 @@ def __init__(self, config_dict: dict):
         self.trusted_node: str = ""
         self.memory_limit: str = "14000m"
         self.validator_address: str = ""
-        self.engine_state_enabled: str = "false"
+        self.engine_state_enabled: bool = False
         self.engine_state_port: str = "3336"
         self.engine_state_address: str = "0.0.0.0"
         self.java_opts: str = (
diff --git a/node-runner-cli/config/CoreSystemDConfig.py b/node-runner-cli/config/CoreSystemDConfig.py
index e4110d44..51c9037a 100644
--- a/node-runner-cli/config/CoreSystemDConfig.py
+++ b/node-runner-cli/config/CoreSystemDConfig.py
@@ -24,7 +24,7 @@ def __init__(self, config_dict: dict):
         self.node_dir: str = "/etc/radixdlt/node"
         self.node_secrets_dir: str = "/etc/radixdlt/node/secrets"
         self.validator_address: str = ""
-        self.engine_state_enabled: str = "false"
+        self.engine_state_enabled: bool = False
         self.engine_state_port: str = "3336"
         self.engine_state_address: str = "0.0.0.0"
         self.java_opts: str = (
diff --git a/node-runner-cli/setup/SystemDCommandArguments.py b/node-runner-cli/setup/SystemDCommandArguments.py
index a878001a..b43e2f01 100644
--- a/node-runner-cli/setup/SystemDCommandArguments.py
+++ b/node-runner-cli/setup/SystemDCommandArguments.py
@@ -21,6 +21,7 @@ class SystemDConfigArguments:
     networkid: str
     hostip: str
     validator: str
+    auto_approve: bool
 
     def __init__(self, args):
         validate_ip(args.hostip)
@@ -44,6 +45,7 @@ def __init__(self, args):
         self.config_file = f"{args.configdir}/config.yaml"
         self.networkid = args.networkid
         self.validator = args.validator
+        self.auto_approve = args.autoapprove
 
 
 def validate_ip(hostip: str):
diff --git a/node-runner-cli/setup/SystemDSetup.py b/node-runner-cli/setup/SystemDSetup.py
index d1225045..7b0b1968 100644
--- a/node-runner-cli/setup/SystemDSetup.py
+++ b/node-runner-cli/setup/SystemDSetup.py
@@ -513,7 +513,7 @@ def ask_core_node(argument_object: SystemDConfigArguments) -> CoreSystemdConfig:
         systemd_config.core_node.keydetails = BaseSetup.ask_keydetails(
             argument_object.keystore_password, argument_object.new_keystore
         )
-        # systemd_config.core_node.engine_state_enabled = BaseSetup.ask_engine_state_api(True)
+        systemd_config.core_node.engine_state_enabled = BaseSetup.ask_engine_state_api(argument_object.auto_approve)
         return systemd_config.core_node
 
     @staticmethod
diff --git a/node-runner-cli/templates/systemd-default.config.j2 b/node-runner-cli/templates/systemd-default.config.j2
index f70f0522..ef78614d 100644
--- a/node-runner-cli/templates/systemd-default.config.j2
+++ b/node-runner-cli/templates/systemd-default.config.j2
@@ -41,4 +41,13 @@ genesis.olympia.node_end_state_api_auth_user={{migration.olympia_node_auth_user}
 genesis.olympia.node_end_state_api_auth_password={{migration.olympia_node_auth_password}}
 genesis.olympia.node_bech32_address={{migration.olympia_node_bech32_address}}
 {% endif %}
-{% endif %}
\ No newline at end of file
+{% endif %}
+
+
+{% if core_node.engine_state_enabled %}
+api.engine_state.port={{core_node.engine_state_port}}
+api.engine_state.bind_address={{core_node.engine_state_address}}
+db.local_transaction_execution_index.enable={{core_node.engine_state_enabled}}
+db.re_node_listing_indices.enable={{core_node.engine_state_enabled}}
+db.historical_substate_values.enable=60000
+{% endif %}
diff --git a/node-runner-cli/tests/userflows/install-systemd-simple.sh b/node-runner-cli/tests/userflows/install-systemd-simple.sh
index be6c27f0..b9b56311 100755
--- a/node-runner-cli/tests/userflows/install-systemd-simple.sh
+++ b/node-runner-cli/tests/userflows/install-systemd-simple.sh
@@ -114,7 +114,7 @@ echo "Checking radixdlt service status again"
 sudo systemctl status radixdlt-node.service --no-pager | true
 
 echo "Checking nginx service status again"
-sudo systemctl status nginx.service --no-pager| true
+sudo systemctl status nginx.service --no-pager | true
 
 echo "Starting systemd service"
 ./babylonnode systemd start
diff --git a/node-runner-cli/utils/Prompts.py b/node-runner-cli/utils/Prompts.py
index d30c4fc0..c991a0c6 100644
--- a/node-runner-cli/utils/Prompts.py
+++ b/node-runner-cli/utils/Prompts.py
@@ -249,17 +249,17 @@ def ask_keyfile_name() -> str:
         return keyfile_name
 
     @staticmethod
-    def ask_engine_state_api(auto_approve: bool) -> str:
+    def ask_engine_state_api(auto_approve: bool) -> bool:
         if auto_approve:
-            return 'true'
+            return False
         answer = Helpers.input_guestion(
             "Do you want to enable the engine state api? (Y/N) (default: false):",
             QuestionKeys.enable_engine_state_api
         )
         if answer == "":
-            return 'false'
+            return False
         else:
-            return 'true'
+            return True
 
     @staticmethod
     def ask_trusted_node() -> str: