diff --git a/Makefile b/Makefile
index 7a46670..64e8853 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,7 @@ ORAS_VERSION := 1.0.0-rc.1
 REGCTL := $(TOOLSDIR)/bin/regctl
 REGCTL_VERSION := 0.5.0
 TOPDIR := $(shell git rev-parse --show-toplevel)
-#BOOTKIT_VERSION ?= "v0.0.17.231018"
-# We need a bootkit with new mosctl which knows about the new network.
-# So use a manually built one.  Then we can auot-build new bootkit,
-# then update the below to the real v0.0.18.2311XX version.
-BOOTKIT_VERSION ?= "v0.0.18.tmp"
+BOOTKIT_VERSION ?= "v0.0.18.231121"
 ROOTFS_VERSION = $(BOOTKIT_VERSION)
 
 archout = $(shell arch)
diff --git a/tests/helpers.bash b/tests/helpers.bash
index 78e74df..3af416d 100644
--- a/tests/helpers.bash
+++ b/tests/helpers.bash
@@ -29,7 +29,7 @@ function trust_setup {
 function common_setup {
 	trust_setup
 
-	export ROOTFS_VERSION="${ROOTFS_VERSION:-v0.0.17.231018}"
+	export ROOTFS_VERSION="${ROOTFS_VERSION:-v0.0.18.231121}"
 	echo "ROOTFS_VERSION is ${ROOTFS_VERSION}"
 
 	if [ ! -d "${PWD}/zothub" ]; then