diff -Nru lxd-agent-loader-0.3/debian/changelog lxd-agent-loader-0.4/debian/changelog
--- lxd-agent-loader-0.3/debian/changelog	2020-03-23 00:45:05.000000000 +0000
+++ lxd-agent-loader-0.4/debian/changelog	2020-04-01 02:58:50.000000000 +0000
@@ -1,3 +1,11 @@
+lxd-agent-loader (0.4) focal; urgency=medium
+
+  * Units: Sync with upstream:
+    - Add retry logic
+    - Tweak unit ordering
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Tue, 31 Mar 2020 22:58:50 -0400
+
 lxd-agent-loader (0.3) focal; urgency=medium
 
   * Fix typo in package description (LP: #1868498)
diff -Nru lxd-agent-loader-0.3/lxd-agent-9p.service lxd-agent-loader-0.4/lxd-agent-9p.service
--- lxd-agent-loader-0.3/lxd-agent-9p.service	2020-03-22 21:23:16.000000000 +0000
+++ lxd-agent-loader-0.4/lxd-agent-9p.service	2020-04-01 02:58:43.000000000 +0000
@@ -2,6 +2,8 @@
 Description=LXD - agent - 9p mount
 Documentation=https://linuxcontainers.org/lxd
 ConditionPathExists=/dev/virtio-ports/org.linuxcontainers.lxd
+After=local-fs.target
+DefaultDependencies=no
 
 [Service]
 Type=oneshot
diff -Nru lxd-agent-loader-0.3/lxd-agent.service lxd-agent-loader-0.4/lxd-agent.service
--- lxd-agent-loader-0.3/lxd-agent.service	2020-03-22 21:23:09.000000000 +0000
+++ lxd-agent-loader-0.4/lxd-agent.service	2020-04-01 02:58:48.000000000 +0000
@@ -4,12 +4,17 @@
 ConditionPathExists=/dev/virtio-ports/org.linuxcontainers.lxd
 Requires=lxd-agent-9p.service
 After=lxd-agent-9p.service
-Before=cloud-init.target
+Before=cloud-init.target cloud-init.service cloud-init-local.service
+DefaultDependencies=no
 
 [Service]
 Type=simple
 WorkingDirectory=/run/lxd_config/9p
 ExecStart=/run/lxd_config/9p/lxd-agent
+Restart=on-failure
+RestartSec=5s
+StartLimitInterval=60
+StartLimitBurst=10
 
 [Install]
 WantedBy=multi-user.target