diff --git a/layers/meta-balena-fsl-arm/conf/samples/bblayers.conf.sample b/layers/meta-balena-fsl-arm/conf/samples/bblayers.conf.sample
index 1bd877e9..e2b99c29 100644
--- a/layers/meta-balena-fsl-arm/conf/samples/bblayers.conf.sample
+++ b/layers/meta-balena-fsl-arm/conf/samples/bblayers.conf.sample
@@ -8,7 +8,7 @@ BBFILES ?= ""
 BBLAYERS ?= " \
     ${TOPDIR}/../layers/meta-balena/meta-balena-rust \
     ${TOPDIR}/../layers/meta-balena/meta-balena-common \
-    ${TOPDIR}/../layers/meta-balena/meta-balena-honister \
+    ${TOPDIR}/../layers/meta-balena/meta-balena-kirkstone \
     ${TOPDIR}/../layers/meta-balena-fsl-arm \
     ${TOPDIR}/../layers/poky/meta \
     ${TOPDIR}/../layers/poky/meta-poky \
diff --git a/layers/meta-balena-fsl-arm/conf/samples/local.conf.sample b/layers/meta-balena-fsl-arm/conf/samples/local.conf.sample
index 2b4adb8c..b7bfe7be 100644
--- a/layers/meta-balena-fsl-arm/conf/samples/local.conf.sample
+++ b/layers/meta-balena-fsl-arm/conf/samples/local.conf.sample
@@ -45,7 +45,7 @@ DISTRO ?= "resin-systemd"
 RM_OLD_IMAGE = "1"
 
 # Additional image features
-USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES ?= "buildstats"
 
 # By default disable interactive patch resolution (tasks will just fail instead):
 PATCHRESOLVE = "noop"
@@ -55,9 +55,9 @@ BB_DISKMON_DIRS = "\
     STOPTASKS,${TMPDIR},1G,100K \
     STOPTASKS,${DL_DIR},1G,100K \
     STOPTASKS,${SSTATE_DIR},1G,100K \
-    ABORT,${TMPDIR},100M,1K \
-    ABORT,${DL_DIR},100M,1K \
-    ABORT,${SSTATE_DIR},100M,1K"
+    HALT,${TMPDIR},100M,1K \
+    HALT,${DL_DIR},100M,1K \
+    HALT,${SSTATE_DIR},100M,1K"
 
 CONF_VERSION = "2"