diff --git a/tools/tools/nanobsd/embedded/qemu-amd64.cfg b/tools/tools/nanobsd/embedded/qemu-amd64.cfg
index c405f04e9d9..f393f1fea0f 100644
--- a/tools/tools/nanobsd/embedded/qemu-amd64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-amd64.cfg
@@ -29,6 +29,6 @@
 NANO_ARCH=amd64
 NANO_NAME=qemu-amd64
 
-qemu_env
+. common	# Pull in common definitions
 
-. common	# Pull in common definitions, keep last
+qemu_env
diff --git a/tools/tools/nanobsd/embedded/qemu-i386.cfg b/tools/tools/nanobsd/embedded/qemu-i386.cfg
index 642f19ae1b6..96ce026d48c 100644
--- a/tools/tools/nanobsd/embedded/qemu-i386.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-i386.cfg
@@ -29,6 +29,6 @@
 NANO_ARCH=i386
 NANO_NAME=qemu-i386
 
-qemu_env
+. common	# Pull in common definitions
 
-. common	# Pull in common definitions, keep last
+qemu_env
diff --git a/tools/tools/nanobsd/embedded/qemu-mips.cfg b/tools/tools/nanobsd/embedded/qemu-mips.cfg
index 1582fdf894e..9242b897491 100644
--- a/tools/tools/nanobsd/embedded/qemu-mips.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-mips.cfg
@@ -31,6 +31,6 @@ NANO_KERNEL=MALTA
 NANO_DRIVE=ada0
 NANO_NAME=qemu-mips
 
-qemu_env
+. common	# Pull in common definitions
 
-. common	# Pull in common definitions, keep last
+qemu_env
diff --git a/tools/tools/nanobsd/embedded/qemu-mips64.cfg b/tools/tools/nanobsd/embedded/qemu-mips64.cfg
index a6ad39e53d6..69fff3af394 100644
--- a/tools/tools/nanobsd/embedded/qemu-mips64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-mips64.cfg
@@ -31,6 +31,6 @@ NANO_KERNEL=MALTA64
 NANO_DRIVE=ada0
 NANO_NAME=qemu-mips64
 
-qemu_env
+. common	# Pull in common definitions
 
-. common	# Pull in common definitions, keep last
+qemu_env
diff --git a/tools/tools/nanobsd/embedded/qemu-powerpc.cfg b/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
index ac1efa1baa1..effdd4b6dac 100644
--- a/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-powerpc.cfg
@@ -32,6 +32,6 @@ NANO_KERNEL=GENERIC
 NANO_DRIVE=ada0
 NANO_NAME=qemu-powerpc
 
-qemu_env
+. common	# Pull in common definitions
 
-. common	# Pull in common definitions, keep last
+qemu_env
diff --git a/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg b/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
index 3789ee8098c..525afc6402c 100644
--- a/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg
@@ -31,6 +31,6 @@ NANO_KERNEL=GENERIC64
 NANO_DRIVE=ada0
 NANO_NAME=qemu-powerpc64
 
-NANO_DISKIMAGE_FORMAT=qcow2
+. common	# Pull in common definitions
 
-. common	# Pull in common definitions, keep last
+qemu_env
diff --git a/tools/tools/nanobsd/embedded/qemu-sparc64.cfg b/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
index d497dd4e048..d5b565d9da2 100644
--- a/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
+++ b/tools/tools/nanobsd/embedded/qemu-sparc64.cfg
@@ -31,6 +31,6 @@ NANO_KERNEL=GENERIC
 NANO_DRIVE=ada0
 NANO_NAME=qemu-sparc64
 
-qemu_env
+. common	# Pull in common definitions
 
-. common	# Pull in common definitions, keep last
+qemu_env