diff --git a/release/tools/oracle.conf b/release/tools/oracle.conf
--- a/release/tools/oracle.conf
+++ b/release/tools/oracle.conf
@@ -17,7 +17,6 @@
     net/py-netifaces
     net/py-oauth
     net/rsync
-    panicmail
     security/ca_root_nss
     security/sudo@default
     sysutils/firstboot-freebsd-update
@@ -56,6 +55,7 @@
 		xz_load="YES"
 		zfs_load="YES"
 EOF
+	metalog_add_data ./boot/loader.conf
 
 	cat <<-'EOF' >> ${DESTDIR}/etc/ssh/sshd_config
 		# S11 Configure the SSH service to prevent password-based login
@@ -83,10 +83,11 @@
 		   network:
 		      renderers: ['freebsd']
 EOF
+	metalog_add_data ./usr/local/etc/cloud/cloud.cfg.d/98_oracle.cfg
 
 	# Use Oracle Cloud Infrastructure NTP server
 	sed -i '' -E -e 's/^pool.*iburst/server 169.254.169.254 iburst/' \
-        ${DESTDIR}/etc/ntp.conf
+            ${DESTDIR}/etc/ntp.conf
 
 	return 0
 }