diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index add31410f633..1312251cdd9e 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,145 +1,145 @@
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
     bin
     ..
     boot
         defaults
         ..
         dtb
             allwinner       tags=package=runtime
             ..
             overlays        tags=package=runtime
             ..
             rockchip        tags=package=runtime
             ..
         ..
         efi
         ..
         firmware
         ..
         fonts
         ..
         images
         ..
         kernel
         ..
         loader.conf.d   tags=package=bootloader
         ..
         lua
         ..
         modules
         ..
         uboot
         ..
         zfs
         ..
     ..
-    dev             mode=0555
+    dev             mode=0555 tags=package=runtime
     ..
     etc
         X11
         ..
         authpf
         ..
         autofs
         ..
         bluetooth
         ..
         cron.d
         ..
         defaults
         ..
         devd
         ..
         dma
         ..
         gss
         ..
         jail.conf.d
         ..
         kyua            tags=package=tests
         ..
         mail
         ..
         mtree
         ..
         newsyslog.conf.d
         ..
         ntp             mode=0700
         ..
         pam.d
         ..
         periodic
             daily
             ..
             monthly
             ..
             security
             ..
             weekly
             ..
         ..
         pkg
         ..
         ppp
         ..
         profile.d
         ..
         rc.conf.d
         ..
         rc.d
         ..
         security
         ..
         ssh
         ..
         ssl
             certs
             ..
             untrusted
             ..
         ..
         sysctl.kld.d
         ..
         syslog.d
         ..
         zfs
             compatibility.d
             ..
         ..
     ..
     lib
         geom
         ..
         nvmecontrol
         ..
     ..
     libexec
         resolvconf
         ..
     ..
     media
     ..
     mnt
     ..
     net
     ..
     proc            mode=0555
     ..
     rescue
     ..
     root            mode=0750
     ..
     sbin
     ..
-    tmp             mode=01777
+    tmp             mode=01777 tags=package=runtime
     ..
     usr
     ..
     var
     ..
 ..
diff --git a/release/packages/runtime.ucl b/release/packages/runtime.ucl
index 8a337c038fdd..b04bc32f33cc 100644
--- a/release/packages/runtime.ucl
+++ b/release/packages/runtime.ucl
@@ -1,12 +1,7 @@
 vital: true
 scripts: {
     post-install = <<EOD
     pwd_mkdb -i -p -d  ${PKG_ROOTDIR}/etc ${PKG_ROOTDIR}/etc/master.passwd
     services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${PKG_ROOTDIR}/var/db/services.db ${PKG_ROOTDIR}/
-    chmod 1777 ${PKG_ROOTDIR}/tmp
 EOD
 }
-directories: {
-    /dev = "y";
-    /tmp = "y";
-}