diff --git a/release/Makefile.oci b/release/Makefile.oci
index 16c475937d15..316086c827db 100644
--- a/release/Makefile.oci
+++ b/release/Makefile.oci
@@ -26,7 +26,14 @@ OCI_TARGETS+= container-image-${_IMG}.txz
 container-image-${_IMG}.txz: ${OCI_DEPS_${_IMG}}
 	# Adjust PATH so that we run pwd_mkdb from the bootstrap tools
 	env PATH=${OBJTOP}/tmp/legacy/bin:${PATH:Q} \
-	sh ${.CURDIR}/scripts/make-oci-image.sh ${.CURDIR} ${REVISION} ${BRANCH} ${TARGET_ARCH} ${_IMG} container-image-${_IMG}.txz
+	sh ${.CURDIR}/scripts/make-oci-image.sh \
+	    ${.CURDIR} \
+	    ${REVISION} \
+	    ${BRANCH} \
+	    ${TARGET_ARCH} \
+	    ${_IMG} \
+	    container-image-${_IMG}.txz \
+	    ${VENDOR_NAME}
 .endfor
 
 oci-release: ${OCI_TARGETS}
diff --git a/release/Makefile.vm b/release/Makefile.vm
index 142fd6e7bdf5..64c31338c86c 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -13,6 +13,7 @@ VMFS?=		ufs
 VMFSLIST?=	ufs zfs
 SWAPSIZE?=	1g
 VMBASE?=	vm
+VENDOR_NAME?=	HardenedBSD
 
 VHD_DESC=	Azure, VirtualPC, Hyper-V, Xen disk image
 VMDK_DESC=	VMWare, VirtualBox disk image
@@ -146,7 +147,7 @@ cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT} ${PKGBASE_REPO_DIR}
 		PKG_CMD=${PKG_CMD:Upkg} \
 		PKG_ABI=${PKG_ABI} \
 		PKG_REPOS_DIR=${PKG_REPOS_DIR:U${.OBJDIR}/${.TARGET}/etc/pkg} \
-		PKG_REPO_NAME=${PKG_REPO_NAME:UFreeBSD-ports} \
+		PKG_REPO_NAME=${PKG_REPO_NAME:U${VENDOR_NAME}} \
 		PKG_INSTALL_EPOCH=${PKG_INSTALL_EPOCH:U${GITEPOCH}} \
 		NOPKGBASE=${NOPKGBASE} \
 		PKGBASE_REPO_DIR=${.OBJDIR}/pkgbase-repo-dir \
@@ -154,7 +155,8 @@ cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT} ${PKGBASE_REPO_DIR}
 		-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
 		-F ${"${_CW:MEC2-BUILDER}" != "":?ufs:${_FS}} \
 		-i ${.OBJDIR}/${_CW:tl}.${_FS}.${_FMT}.img -s ${VMSIZE} -f ${_FMT} \
-		-S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}${_FS:tu}${_FMT:tu}IMAGE} -c ${${_CW:tu}CONF} || true
+		-S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}${_FS:tu}${_FMT:tu}IMAGE} -c ${${_CW:tu}CONF} \
+		-V ${VENDOR_NAME} || true
 	touch ${.TARGET}
 .   endfor
 .  endfor
@@ -205,7 +207,7 @@ vm-image:	${QEMUTGT} ${PKGBASE_REPO_DIR}
 		PKG_CMD=${PKG_CMD:Upkg} \
 		PKG_ABI=${PKG_ABI} \
 		PKG_REPOS_DIR=${PKG_REPOS_DIR:U${.OBJDIR}/${.TARGET}-${FORMAT}-${FS}/etc/pkg} \
-		PKG_REPO_NAME=${PKG_REPO_NAME:UFreeBSD-ports} \
+		PKG_REPO_NAME=${PKG_REPO_NAME:UHardenedBSD} \
 		PKG_INSTALL_EPOCH=${PKG_INSTALL_EPOCH:U${GITEPOCH}} \
 		NOPKGBASE=${NOPKGBASE} \
 		PKGBASE_REPO_DIR=${.OBJDIR}/pkgbase-repo-dir \
diff --git a/release/amd64/amd64.conf b/release/amd64/amd64.conf
index e709c10b743a..66a443d423c7 100644
--- a/release/amd64/amd64.conf
+++ b/release/amd64/amd64.conf
@@ -6,4 +6,4 @@
 
 TARGET="amd64"
 TARGET_ARCH="amd64"
-KERNEL="GENERIC"
+KERNEL="HARDENEDBSD"
diff --git a/release/scripts/make-oci-image.sh b/release/scripts/make-oci-image.sh
index f8ea679bfd18..24f09ed3b856 100644
--- a/release/scripts/make-oci-image.sh
+++ b/release/scripts/make-oci-image.sh
@@ -8,12 +8,14 @@ branch=$1; shift
 arch=$1; shift
 image=$1; shift
 output=$1; shift
+vendor_name=$1; shift
 
 major=${rev%.*}
 minor=${rev#*.}
 
 abi=FreeBSD:${major}:${arch}
 ver=${rev}-${branch}-${arch}
+vendor_name=${vendor_name:-HardenedBSD}
 
 echo "Building OCI freebsd${major}-${image} image for ${abi}"
 
@@ -26,7 +28,7 @@ init_repo() {
 
 	mkdir -p ${workdir}/repos
 	cat > ${workdir}/repos/base.conf <<EOF
-FreeBSD-base: {
+${vendor_name}-base: {
   url: "file:///usr/obj${srcdir}/repo/${abi}/latest"
   signature_type: "none"
   fingerprints: "none"
diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh
index d9197de66695..f04b1b3fae01 100755
--- a/release/scripts/mk-vmimage.sh
+++ b/release/scripts/mk-vmimage.sh
@@ -69,6 +69,9 @@ main() {
 			S)
 				WORLDDIR="${OPTARG}"
 				;;
+			V)
+				VENDOR_NAME="${OPTARG}"
+				;;
 			*)
 				;;
 		esac