diff --git a/scripts/packages/nginx-agent.service b/scripts/packages/nginx-agent.service
index 2f3454cfc..1934e4ac8 100644
--- a/scripts/packages/nginx-agent.service
+++ b/scripts/packages/nginx-agent.service
@@ -2,7 +2,7 @@
 Description=NGINX Agent
 Documentation=https://github.com/nginx/agent#readme
 After=network.target
-Wants=network-online.target
+Wants=network.target
 StartLimitIntervalSec=15
 StartLimitBurst=5
 
@@ -11,24 +11,19 @@ User=${AGENT_USER}
 Group=${AGENT_GROUP}
 Type=simple
 
-ExecStartPre=/bin/mkdir -p ${AGENT_RUN_DIR}
-ExecStartPre=/bin/mkdir -p ${AGENT_LOG_DIR}
+LogsDirectory=nginx-agent
+RuntimeDirectory=nginx-agent
+StateDirectory=nginx-agent
 
 ExecStart=${AGENT_EXE}
-
 RestartSec=5
-Restart=always
-
+Restart=on-failure
 PermissionsStartOnly=true
-PIDFile=${AGENT_RUN_DIR}/nginx-agent.pid
-Environment=
-
-StandardOutput=syslog
-StandardError=syslog
-SyslogIdentifier=nginx-agent
+TimeoutStopSec=5s
 
-ExecStop=/bin/kill -2 $MAINPID
-ExecStop=/bin/sleep 3
+NoNewPrivileges=true
+ProtectHome=off
+PrivateTmp=true
 
 [Install]
 WantedBy=multi-user.target
diff --git a/scripts/packages/postinstall.sh b/scripts/packages/postinstall.sh
index ea767c752..3c2f252b1 100755
--- a/scripts/packages/postinstall.sh
+++ b/scripts/packages/postinstall.sh
@@ -6,7 +6,7 @@
 
 
 AGENT_EXE="/usr/bin/nginx-agent"
-AGENT_RUN_DIR="/var/run/nginx-agent"
+AGENT_RUN_DIR="/run/nginx-agent"
 AGENT_LOG_DIR="/var/log/nginx-agent"
 AGENT_ETC_DIR="/etc/nginx-agent"
 AGENT_LIB_DIR="/var/lib/nginx-agent/"