diff --git a/documentation/quick-build.rst b/documentation/quick-build.rst
index ed4abfe..7fec776 100644
--- a/documentation/quick-build.rst
+++ b/documentation/quick-build.rst
@@ -100,11 +100,11 @@ the machine is set to `cn9130-cf-pro` but you can use any other MACHINE listed i
     occurrences of `cn9130-cf-pro` to your machine when executing a command.
 
 For an image that contains a lot of developer tools, the best image to build
-is `coreos-image-demo`.
+is `coreos-image-all-features`.
 
 .. code-block:: sh
 
-   ~/img-build/build$ bitbake coreos-image-demo
+   ~/img-build/build$ bitbake coreos-image-all-features
 
 After a long time, the build system will return. You can list all the artifacts
 produced by `bitbake` using `ls`:
@@ -119,7 +119,7 @@ be found with this command:
 .. code-block:: sh
 
    ~/coreos/build$ find tmp/deploy/images/${MACHINE} -type l -name "*.wic.xz"
-   tmp/deploy/images/cn9130-cf-pro/coreos-image-demo-cn9130-cf-pro.wic.xz
+   tmp/deploy/images/cn9130-cf-pro/coreos-image-all-features-cn9130-cf-pro.wic.xz
 
 .. hint::
 
@@ -167,6 +167,6 @@ Now, flash the image file to the your card:
 
 .. code-block:: sh
 
-   ~/coreos/build$ bmaptool copy tmp/deploy/images/cn9130-cf-pro/coreos-image-demo-cn9130-cf-pro.wic.xz /dev/<DISKNAME>
+   ~/coreos/build$ bmaptool copy tmp/deploy/images/cn9130-cf-pro/coreos-image-all-features-cn9130-cf-pro.wic.xz /dev/<DISKNAME>
 
 You have to replace `<DISKNAME>` by the name of your SD Card device.
diff --git a/documentation/ref-manual/images.rst b/documentation/ref-manual/images.rst
index f7032f0..0a95c10 100644
--- a/documentation/ref-manual/images.rst
+++ b/documentation/ref-manual/images.rst
@@ -4,12 +4,20 @@ Images
 
 The CoreOS build system provides several examples image:
 
-.. index:: coreos-image-demo
+.. index:: coreos-image-all-features
+
+``coreos-image-all-features``
+=============================
+
+ An image with most of the optional feature of CoreOS.
+
+ .. index:: coreos-image-demo
 
 ``coreos-image-demo``
 =============================
 
- A image with most of the optional feature of CoreOS.
+ An image based on `coreos-image-all-features`` that has additional demo
+ features activated.
 
 .. index:: coreos-image-minimal
 
diff --git a/layers/meta-belden-coreos-demo/recipes-core/images/coreos-image-demo.bb b/layers/meta-belden-coreos-demo/recipes-core/images/coreos-image-demo.bb
new file mode 100644
index 0000000..c832c05
--- /dev/null
+++ b/layers/meta-belden-coreos-demo/recipes-core/images/coreos-image-demo.bb
@@ -0,0 +1,4 @@
+DESCRIPTION = "An image that come with most of the feature available in CoreOS"
+
+inherit coreos-image
+require coreos-image-all-features
diff --git a/layers/meta-belden-coreos/recipes-core/images/coreos-image-demo.bb b/layers/meta-belden-coreos/recipes-core/images/coreos-image-all-features.bb
similarity index 100%
rename from layers/meta-belden-coreos/recipes-core/images/coreos-image-demo.bb
rename to layers/meta-belden-coreos/recipes-core/images/coreos-image-all-features.bb
diff --git a/scripts/coreos-device b/scripts/coreos-device
index 2830089..7140eea 100755
--- a/scripts/coreos-device
+++ b/scripts/coreos-device
@@ -6,12 +6,12 @@
     Currently only a swupdate-www-push subcommand is available.
 
     It can be used this way:
-        coreos-device swupdate-www-push ~/coreos-image-demo-vm-x64.swu 192.168.122.21
+        coreos-device swupdate-www-push ~/coreos-image-all-features-vm-x64.swu 192.168.122.21
 
     This script doesn't interact with bitbake so it can't retrieve variables from
     bitbake. For a more user friendly usage you can use devtool:
 
-    devtool swupdate-www-push coreos-image-demo 192.168.122.21
+    devtool swupdate-www-push coreos-image-all-features 192.168.122.21
 """
 
 import os
diff --git a/templates/conf-notes.txt b/templates/conf-notes.txt
index ec56139..c4c8f7b 100644
--- a/templates/conf-notes.txt
+++ b/templates/conf-notes.txt
@@ -11,6 +11,7 @@ You can now run 'bitbake <target>'
 
 Common targets are:
     coreos-image-minimal
+    coreos-image-all-features
     coreos-image-demo
 
 You can also run generated qemu images with a command like 'runqemu qemuarm64'.