diff --git a/release/tools/oci-image-notoolchain.conf b/release/tools/oci-image-notoolchain.conf
--- a/release/tools/oci-image-notoolchain.conf
+++ b/release/tools/oci-image-notoolchain.conf
@@ -1,68 +1,12 @@
 #! /bin/sh
 
-# Build OCI container image with almost all packages suitable for jails, excluding compiler
+# Build OCI container image with almost all packages suitable for jails,
+# excluding toolchain.
 
 OCI_BASE_IMAGE=runtime
 
 oci_image_build() {
 	set_cmd ${workdir} /bin/sh
 	install_packages ${abi} ${workdir} \
-		FreeBSD-acct \
-		FreeBSD-at \
-		FreeBSD-audit \
-		FreeBSD-autofs \
-		FreeBSD-blocklist \
-		FreeBSD-bsnmp \
-		FreeBSD-caroot \
-		FreeBSD-certctl \
-		FreeBSD-clibs \
-		FreeBSD-console-tools \
-		FreeBSD-cron \
-		FreeBSD-csh \
-		FreeBSD-dma \
-		FreeBSD-ee \
-		FreeBSD-fd \
-		FreeBSD-fetch \
-		FreeBSD-ftp \
-		FreeBSD-ftpd \
-		FreeBSD-inetd \
-		FreeBSD-ipf \
-		FreeBSD-ipfw \
-		FreeBSD-iscsi \
-		FreeBSD-jail \
-		FreeBSD-kerberos \
-		FreeBSD-kerberos-lib \
-		FreeBSD-libarchive \
-		FreeBSD-libcompiler_rt-dev \
-		FreeBSD-libexecinfo \
-		FreeBSD-libucl \
-		FreeBSD-locales \
-		FreeBSD-lp \
-		FreeBSD-mtree \
-		FreeBSD-natd \
-		FreeBSD-netmap \
-		FreeBSD-newsyslog \
-		FreeBSD-nfs \
-		FreeBSD-nuageinit \
-		FreeBSD-openssl \
-		FreeBSD-periodic \
-		FreeBSD-pf \
-		FreeBSD-pkg-bootstrap \
-		FreeBSD-quotacheck \
-		FreeBSD-rc \
-		FreeBSD-rcmds \
-		FreeBSD-rescue \
-		FreeBSD-resolvconf \
-		FreeBSD-runtime \
-		FreeBSD-ssh \
-		FreeBSD-syslogd \
-		FreeBSD-tcpd \
-		FreeBSD-telnet \
-		FreeBSD-ufs \
-		FreeBSD-unbound \
-		FreeBSD-utilities \
-		FreeBSD-vi \
-		FreeBSD-yp \
-		FreeBSD-zfs \
-		FreeBSD-zoneinfo
+		FreeBSD-set-minimal-jail
 }
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
@@ -1,16 +1,11 @@
 #! /bin/sh
 
-# Build Open Container Initiative (OCI) container image with almost all of FreeBSD base.txz
+# Build OCI container images with almost all packages for running and building FreeBSD.
 
 OCI_BASE_IMAGE=notoolchain
 
 oci_image_build() {
 	set_cmd ${workdir} /bin/sh
 	install_packages ${abi} ${workdir} \
-		FreeBSD-clang \
-		FreeBSD-ctf-tools \
-		FreeBSD-lld \
-		FreeBSD-lldb \
-		FreeBSD-toolchain \
-		FreeBSD-*-dev
+		FreeBSD-set-devel
 }