diff --git a/release/tools/oci-image-toolchain.conf b/release/tools/oci-image-toolchain.conf
--- a/release/tools/oci-image-toolchain.conf
+++ b/release/tools/oci-image-toolchain.conf
@@ -6,11 +6,24 @@
 
 oci_image_build() {
 	set_cmd ${workdir} /bin/sh
-	install_packages ${abi} ${workdir} \
+
+	# Base packages for all architectures
+	packages="
 		FreeBSD-clang \
 		FreeBSD-ctf-tools \
 		FreeBSD-lld \
-		FreeBSD-lldb \
 		FreeBSD-toolchain \
-		FreeBSD-*-dev
+		FreeBSD-*-dev"
+
+	# Add lldb for non-RISCV architectures
+	case "${TARGET_ARCH}" in
+		riscv*)
+			# Skip lldb for RISCV
+			;;
+		*)
+			packages="${packages} FreeBSD-lldb"
+			;;
+	esac
+
+	install_packages ${abi} ${workdir} ${packages}
 }