diff --git a/release/tools/azure.conf b/release/tools/azure.conf
index 519ab13fe43..a633e6e508d 100644
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -27,7 +27,8 @@ vm_extra_pre_umount() {
 	# them from the image allows it to boot faster.
 	chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
 		/usr/sbin/pkg delete -f -y pkg
-	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD
+	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports
+	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports-kmods
 
 	chroot ${DESTDIR} ${EMULATOR} pw usermod root -h -
 
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index ef7a603efea..31f40962b19 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -27,7 +27,8 @@ ec2_common() {
 	chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
 		/usr/sbin/pkg delete -f -y pkg
 	umount ${DESTDIR}/dev
-	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD
+	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports
+	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports-kmods
 
 	# Turn off IPv6 Duplicate Address Detection; the EC2 networking
 	# configuration makes it unnecessary.
diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf
index c212af7d012..506174d0ea1 100644
--- a/release/tools/vagrant.conf
+++ b/release/tools/vagrant.conf
@@ -20,7 +20,8 @@ vagrant_common () {
 	# them from the image allows it to boot faster.
 	env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} clean -y -a
 	env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg
-	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD
+	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports
+	rm -r ${DESTDIR}/var/db/pkg/repos/FreeBSD-ports-kmods
 
 	# Vagrant instances use DHCP to get their network configuration.
 	echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf