diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index 7809ed51..a798d29b 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -281,6 +281,7 @@ suse
 Swatinem
 SWbem
 sysinfoapi
+sysinit
 SYSLIB
 SYSTEMDRIVE
 taiki
diff --git a/proxy_agent_setup/src/linux/azure-proxy-agent.service b/proxy_agent_setup/src/linux/azure-proxy-agent.service
index 4a6164bb..5adc6cf4 100644
--- a/proxy_agent_setup/src/linux/azure-proxy-agent.service
+++ b/proxy_agent_setup/src/linux/azure-proxy-agent.service
@@ -1,8 +1,12 @@
 [Unit]
 Description=Microsoft Azure GuestProxyAgent
+# azure-proxy-agent supposed to be an early boot and late system shutdown service
+DefaultDependencies=no
 After=local-fs.target
 Before=network-pre.target
-Wants=network-pre.target
+# Baseline init + clean shutdown
+Before=shutdown.target
+Conflicts=shutdown.target
 
 [Service]
 Type=simple