diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f0cb01c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+
+/.pc/
+/_build/
diff --git a/google-guest-agent.service b/google-guest-agent.service
index 79b8e39..23c506e 100644
--- a/google-guest-agent.service
+++ b/google-guest-agent.service
@@ -1,24 +1,14 @@
 [Unit]
 Description=Google Compute Engine Guest Agent
 # Start before sshd in order to regenerate SSH host keys.
-Before=sshd.service
-# Start after network is online and restart when network service is restarted.
-#   Debian/Ubuntu 16.04: networking.service
-#   SLES/EL7: network.service (SLES via wicked.service)
-#   EL8: NetworkManager.service
-#   COS/Ubuntu 18.04+: systemd-networkd.service
-After=network-online.target syslog.service
-After=network.service networking.service NetworkManager.service systemd-networkd.service
-Wants=network-online.target
-PartOf=network.service networking.service NetworkManager.service systemd-networkd.service
+Before=ssh.service
+After=network-online.target
 
 [Service]
 Type=notify
 ExecStart=/usr/bin/google_guest_agent
-OOMScoreAdjust=-999
+OOMScoreAdjust=-900
 Restart=always
 
 [Install]
-WantedBy=sshd.service
 WantedBy=multi-user.target
-WantedBy=network.service networking.service NetworkManager.service systemd-networkd.service
diff --git a/google-shutdown-scripts.service b/google-shutdown-scripts.service
index 16bb9c2..29f8730 100644
--- a/google-shutdown-scripts.service
+++ b/google-shutdown-scripts.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Google Compute Engine Shutdown Scripts
-Wants=network-online.target rsyslog.service
-After=network-online.target rsyslog.service
+After=network-online.target google-guest-agent.service
 
 [Service]
 Type=oneshot
@@ -9,7 +8,9 @@ ExecStart=/bin/true
 RemainAfterExit=true
 # This service does nothing on start, and runs shutdown scripts on stop.
 ExecStop=/usr/bin/google_metadata_script_runner shutdown
-TimeoutStopSec=0
+# Shutdown needs to be finished in 90s
+# https://cloud.google.com/compute/docs/instances/deleting-instance#delete_timeout
+TimeoutStopSec=90s
 KillMode=process
 
 [Install]
diff --git a/google-startup-scripts.service b/google-startup-scripts.service
index dfc9838..3eb3355 100644
--- a/google-startup-scripts.service
+++ b/google-startup-scripts.service
@@ -1,13 +1,12 @@
 [Unit]
 Description=Google Compute Engine Startup Scripts
-Wants=network-online.target rsyslog.service
-After=network-online.target rsyslog.service google-guest-agent.service
+After=network-online.target google-guest-agent.service
 Before=apt-daily.service
 
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/google_metadata_script_runner startup
-#TimeoutStartSec is ignored for Type=oneshot service units.
+RemainAfterExit=true
 KillMode=process
 
 [Install]
diff --git a/instance_configs.cfg b/instance_configs.cfg
index b515cf8..3005173 100644
--- a/instance_configs.cfg
+++ b/instance_configs.cfg
@@ -15,10 +15,10 @@ network_daemon = true
 [InstanceSetup]
 host_key_types = ecdsa,ed25519,rsa
 network_enabled = true
-optimize_local_ssd = true
+optimize_local_ssd = false
 set_boto_config = true
 set_host_keys = true
-set_multiqueue = true
+set_multiqueue = false
 
 [IpForwarding]
 ethernet_proto_id = 66
