diff --git a/install/install.sh b/install/install.sh
index 743f75e..2b0091c 100644
--- a/install/install.sh
+++ b/install/install.sh
@@ -145,9 +145,6 @@ else
     echo "ceremonyclient.service file does not exist. No action taken."
 fi
 
-CPU_THREADS=$(nproc)
-CPU_QUOTA=$(( CPU_THREADS * 90 ))
-
 sudo tee /lib/systemd/system/ceremonyclient.service > /dev/null <<EOF
 [Unit]
 Description=Ceremony Client Go App Service
@@ -158,6 +155,8 @@ Restart=always
 RestartSec=5s
 WorkingDirectory=$NODE_PATH
 ExecStart=$EXEC_START
+KillSignal=SIGINT
+TimeoutStopSec=30s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/install/install_quilibrium_service.sh b/install/install_quilibrium_service.sh
index e552786..68369f4 100644
--- a/install/install_quilibrium_service.sh
+++ b/install/install_quilibrium_service.sh
@@ -162,6 +162,8 @@ Restart=always
 RestartSec=5s
 WorkingDirectory=$NODE_PATH
 ExecStart=$EXEC_START
+KillSignal=SIGINT
+TimeoutStopSec=30s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/update/update.sh b/update/update.sh
index 3207a31..8a31ed9 100644
--- a/update/update.sh
+++ b/update/update.sh
@@ -83,6 +83,8 @@ Restart=always
 RestartSec=5s
 WorkingDirectory=$NODE_PATH
 ExecStart=$EXEC_START
+KillSignal=SIGINT
+TimeoutStopSec=30s
 
 [Install]
 WantedBy=multi-user.target