diff --git a/conf/machine/baremetal-riscv32.conf b/conf/machine/baremetal-riscv32.conf
index 648f274..5849353 100644
--- a/conf/machine/baremetal-riscv32.conf
+++ b/conf/machine/baremetal-riscv32.conf
@@ -16,7 +16,4 @@ QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
 QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
 QB_SLIRP_OPT = "-netdev user,id=net0,hostfwd=tcp::22222-:22"
 
-# Prelink does not yet work
-USER_CLASSES:remove = "image-prelink"
-
 TCLIBC = "baremetal"
diff --git a/conf/machine/baremetal-riscv32nf.conf b/conf/machine/baremetal-riscv32nf.conf
index 4827169..296bd93 100644
--- a/conf/machine/baremetal-riscv32nf.conf
+++ b/conf/machine/baremetal-riscv32nf.conf
@@ -16,7 +16,4 @@ QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
 QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
 QB_SLIRP_OPT = "-netdev user,id=net0,hostfwd=tcp::22222-:22"
 
-# Prelink does not yet work
-USER_CLASSES:remove = "image-prelink"
-
 TCLIBC = "baremetal"
diff --git a/conf/machine/baremetal-riscv64.conf b/conf/machine/baremetal-riscv64.conf
index 693cf38..087dedb 100644
--- a/conf/machine/baremetal-riscv64.conf
+++ b/conf/machine/baremetal-riscv64.conf
@@ -16,7 +16,4 @@ QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
 QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,id=hd0 -device virtio-blk-device,drive=hd0"
 QB_SLIRP_OPT = "-netdev user,id=net0,hostfwd=tcp::22222-:22"
 
-# Prelink does not yet work
-USER_CLASSES:remove = "image-prelink"
-
 TCLIBC = "baremetal"
diff --git a/setup.sh b/setup.sh
index 8917b5d..2be2671 100644
--- a/setup.sh
+++ b/setup.sh
@@ -60,7 +60,7 @@ EXTRA_IMAGE_FEATURES:append = " ssh-server-dropbear"
 EXTRA_IMAGE_FEATURES:append = " package-management"
 PACKAGECONFIG:append:pn-qemu-native = " sdl"
 PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl"
-USER_CLASSES ?= "buildstats buildhistory buildstats-summary image-prelink"
+USER_CLASSES ?= "buildstats buildhistory buildstats-summary"
 
 require conf/distro/include/no-static-libs.inc
 require conf/distro/include/yocto-uninative.inc