diff --git a/release/Makefile.vm b/release/Makefile.vm
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -37,8 +37,8 @@
 GCE_FORMAT=	raw
 GCE_FSLIST=	ufs zfs
 GCE_DESC=	Google Compute Engine image
-OCI_FORMAT=	qcow2
-OCI_FSLIST=	ufs
+OCI_FORMAT=	raw
+OCI_FSLIST=	ufs zfs
 OCI_DESC=	Oracle Cloud Infrastructure image
 OPENSTACK_FORMAT=qcow2
 OPENSTACK_FSLIST=	ufs
diff --git a/release/tools/oci.conf b/release/tools/oci.conf
--- a/release/tools/oci.conf
+++ b/release/tools/oci.conf
@@ -11,7 +11,7 @@
     ftp/curl
     lang/python
     lang/python3
-    net/cloud-init
+    net/cloud-init-devel
     net/py-eventlet
     net/py-netaddr
     net/py-netifaces
@@ -27,7 +27,7 @@
     "
 
 # Should be enough for base image, image can be resized in needed
-export VMSIZE=6g
+export VMSIZE=8g
 
 # Set to a list of third-party software to enable in rc.conf(5).
 export VM_RC_LIST="
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -141,7 +141,7 @@
 	chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
 		/usr/sbin/pkg bootstrap -y
 	for p in ${VM_EXTRA_PACKAGES}; do
-		chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
+		chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes AUTOCLEAN=yes \
 			/usr/sbin/pkg install -y ${p}
 	done
 	umount_loop ${DESTDIR}/dev