diff --git a/debian/changelog b/debian/changelog
index 72585455..d726b3dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+livecd-rootfs (2.478) UNRELEASED; urgency=medium
+
+  * Two last minute server-live fixes:
+    - Seed the subiquity snap to track the stable channel (LP: #1724410)
+    - Remove snap.subiquity.started from subiquity's After=/Requires= as it
+      does not fix the race condition they were intended to address and causes
+      subiquity to be killed when snapd refreshes subiquity (LP: #1724411)
+
+ -- Michael Hudson-Doyle <mwhudson@debian.org>  Wed, 18 Oct 2017 13:22:50 +1300
+
 livecd-rootfs (2.477) artful; urgency=medium
 
   * Fix server live image to pull subiquity from the stable channel, not
diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
index da2bc3c0..87c743dd 100755
--- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
+++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
@@ -64,7 +64,7 @@ snaps:
    channel: stable
    file: ${CORE_SNAP}
  - name: subiquity
-   channel: edge
+   channel: stable
    classic: true
    file: ${SUBIQUITY_SNAP}
 EOF
diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service
index 36df8e1a..89d44bd2 100644
--- a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service
+++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service
@@ -1,8 +1,8 @@
 [Unit]
 Description=Subiquity, the installer for Ubuntu Server
 After=systemd-user-sessions.service plymouth-quit-wait.service
-After=rc-local.service snap.subiquity.started.service
-Requires=snapd.service snap.subiquity.started.service
+After=rc-local.service
+Requires=snapd.service
 IgnoreOnIsolate=yes
 ConditionPathExists=/dev/tty0
 ConditionPathExists=!/run/subiquity/complete