diff --git a/opennebula-images/freebsd-build-opennebula-image.sh b/opennebula-images/freebsd-build-opennebula-image.sh
index ec64a56..535d2a6 100755
--- a/opennebula-images/freebsd-build-opennebula-image.sh
+++ b/opennebula-images/freebsd-build-opennebula-image.sh
@@ -9,15 +9,13 @@ set -x
 # XXX: Handle command-line arguments?
 RELEASE=12.1-RELEASE
 ARCH=amd64
-IMAGE_PATH=freebsd-$RELEASE-$(date +%+F).img.qcow2
+IMAGE_PATH=freebsd-$RELEASE-$(date -I).img.qcow2
 IMAGE_SIZE=10G
 
 DIST_BASE="https://download.freebsd.org/ftp/releases/$ARCH/$RELEASE"
 PORTS_BASE="https://download.freebsd.org/ftp/snapshots/$ARCH/12.1-STABLE"
 
-# TODO: find the package definition and built ourself, publish in some RPM repository.
-ONE_CONTEXT_RPM_URL="https://github.com/OpenNebula/addon-context-linux/releases/download/v5.10.0/one-context-5.10.0-1.el8.noarch.rpm"
-ONE_CONTEXT_RPM_PATH=/root/one-context.rpm
+ONE_CONTEXT_PKG_URL="https://github.com/OpenNebula/addon-context-linux/releases/download/v5.12.0/one-context-5.12.0_1.txz"
 
 cleanup() {
 	sync || true
@@ -70,7 +68,7 @@ growfs_enable=YES
 hostname="freebsd"
 EOF
 
-cp /etc/resolv.conf > /mnt/etc/resolv.conf
+cp /etc/resolv.conf /mnt/etc/resolv.conf
 tzsetup -s -C /mnt UTC
 
 cat >>/mnt/etc/ssh/sshd_config <<EOF
@@ -98,7 +96,11 @@ then
 fi
 
 env ASSUME_ALWAYS_YES=YES pkg -c /mnt bootstrap -f
-env ASSUME_ALWAYS_YES=YES pkg -c /mnt install bash
+env ASSUME_ALWAYS_YES=YES pkg -c /mnt install bash curl
+
+curl -L "$ONE_CONTEXT_PKG_URL" -o /mnt/one-context.txz
+env ASSUME_ALWAYS_YES=YES pkg -c /mnt add one-context.txz
+rm /mnt/one-context.txz
 
 fetch -m -o "$dist_dir/ports.txz" "$PORTS_BASE/ports.txz"
 tar -C /mnt -xJf "$dist_dir/ports.txz"
@@ -107,8 +109,8 @@ cleanup
 trap : EXIT
 
 mkdir -p "$ARCH"
-qemu-img convert -f raw -O qcow2 $disk "$ARCH"/root.img.qcow2
-rm $disk
+qemu-img convert -f raw -O qcow2 "$disk" "$IMAGE_PATH"
+rm "$disk"
 
 # Filesystem will be enlarged by growfs(7) on next startup
-qemu-img resize $IMAGE_PATH $IMAGE_SIZE
+qemu-img resize "$IMAGE_PATH" "$IMAGE_SIZE"