diff --git a/clouddriver-web/lib/systemd/system/clouddriver.service b/clouddriver-web/lib/systemd/system/clouddriver.service
index 74f326d421d..c3e53372022 100644
--- a/clouddriver-web/lib/systemd/system/clouddriver.service
+++ b/clouddriver-web/lib/systemd/system/clouddriver.service
@@ -1,10 +1,11 @@
 [Unit]
 Description=Spinnaker Clouddriver
-After=network.target
+PartOf=spinnaker.service
 
 [Service]
 ExecStart=/opt/clouddriver/bin/clouddriver 2>&1 /var/log/spinnaker/clouddriver/clouddriver.log
 WorkingDirectory=/opt/clouddriver/bin
+SuccessExitStatus=143
 User=spinnaker
 Group=spinnaker
 Type=simple