diff --git a/pmc.service b/pmc.service
index 60f1add..163f4c6 100644
--- a/pmc.service
+++ b/pmc.service
@@ -1,18 +1,23 @@
 [Unit]
 Description=PMC Daemon
 After=network.target
 
 [Service]
+LimitNOFILE=infinity
+LimitNPROC=infinity
+LimitCORE=infinity
+
 User=root
 Type=forking
-LimitNOFILE=4096
 WorkingDirectory=/root/.pmc
 PIDFile=/root/.pmc/daemon.pid
-ExecStart=/root/.cargo/bin/pmc daemon start
 Restart=on-failure
 StartLimitInterval=180
 StartLimitBurst=30
 RestartSec=5s
 
+ExecStart=/root/.cargo/bin/pmc daemon start
+ExecStop=/root/.cargo/bin/pmc daemon stop
+
 [Install]
 WantedBy=multi-user.target