diff --git a/live-build/functions b/live-build/functions
index 312ec0c3..b51ef895 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -566,10 +566,11 @@ _snap_post_process() {
             # If the 'core' snap is not present, assume we are coreXX-only and
             # install the snapd snap.
             channel=stable
-            # FIXME: TPM-FDE spike, to be removed after the spike is over.
-            if [ $PROJECT = "ubuntu" ]; then
-                channel=edge
-            fi
+            # FIXME: This can be commented and uncommented to enable snaps from
+            # edge for development spikes.
+            # if [ $PROJECT = "ubuntu" ]; then
+            #     channel=edge
+            # fi
             if [ ! -f ${snaps_dir}/core_[0-9]*.snap ]; then
                 _snap_preseed $CHROOT_ROOT snapd "$channel"
             fi
diff --git a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary
index abcb7e78..548b8b80 100755
--- a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary
+++ b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary
@@ -60,10 +60,10 @@ reset_snapd_state chroot
 # everything but pc-kernel.
 env SNAPPY_STORE_NO_CDN=1 UBUNTU_STORE_COHORT_KEY="+" snap prepare-image \
     --classic $model $channel \
-    --snap=pc-kernel=25.10/candidate \
-    --snap=snapd=latest/edge \
-    --snap=desktop-security-center=1/edge \
-    --snap=firmware-updater=1/edge \
+    --snap=pc-kernel=25.10/stable \
+    --snap=snapd=latest/stable \
+    --snap=desktop-security-center=1/stable \
+    --snap=firmware-updater=1/stable \
     chroot
 
 mv chroot/system-seed/systems/* chroot/system-seed/systems/enhanced-secureboot-desktop