diff --git a/layers/meta-nwl-distro/recipes-core/images/nwl-image-minimal.bb b/layers/meta-nwl-distro/recipes-core/images/nwl-image-minimal.bb
new file mode 100644
index 0000000..3eabf95
--- /dev/null
+++ b/layers/meta-nwl-distro/recipes-core/images/nwl-image-minimal.bb
@@ -0,0 +1,4 @@
+SUMMARY = "A small image just capable of allowing a device to boot."
+MAINTAINER = "Samuel Dolt <samuel.dolt@netmodule.com>"
+
+inherit nwl-image
diff --git a/layers/meta-nwl-distro/recipes-core/images/nwl-image-testable.bb b/layers/meta-nwl-distro/recipes-core/images/nwl-image-testable.bb
new file mode 100644
index 0000000..60e7efc
--- /dev/null
+++ b/layers/meta-nwl-distro/recipes-core/images/nwl-image-testable.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Image used to run test inside our CI environment."
+MAINTAINER = "Samuel Dolt <samuel.dolt@netmodule.com>"
+
+# Ensure that the .ci-artifacts file that list artifacts that is important
+# for the CI is generated
+COREOS_IMAGE_EXTRACLASSES += "coreos-image-ci"
+
+inherit nwl-image
+
+# The coreos-image-ci class generate a default list of files to write
+# to the .ci-artficats file
+# NWL specific files can be added as well:
+# COREOS_CI_DEPLOY_ARTIFACTS += "${IMAGE_LINK_NAME}.custom.binary"
+
+# Add features and packages that are used in our tests:
+IMAGE_FEATURES += "ssh-server networkmanager swupdate"
+IMAGE_INSTALL:append = " packagegroup-core-full-cmdline swupdate-www"
diff --git a/templates/conf-notes.txt b/templates/conf-notes.txt
index 8e42e9d..ffbfca6 100644
--- a/templates/conf-notes.txt
+++ b/templates/conf-notes.txt
@@ -27,9 +27,8 @@
 You can now run 'bitbake <target>'
 
 Common targets are:
-    coreos-image-minimal
-    coreos-image-all-features
-    coreos-image-demo
+    nwl-image-minimal
+    nwl-image-testable
 
 You can also run generated qemu images with a command like 'runqemu qemuarm64'.