diff --git a/meta-cube/recipes-core/images/c3-app-container.inc b/meta-cube/classes/c3-app-container.bbclass
similarity index 51%
rename from meta-cube/recipes-core/images/c3-app-container.inc
rename to meta-cube/classes/c3-app-container.bbclass
index d6ad0da5..fb65c00e 100644
--- a/meta-cube/recipes-core/images/c3-app-container.inc
+++ b/meta-cube/classes/c3-app-container.bbclass
@@ -1,8 +1,3 @@
-SUMMARY ?= "Sample application container"
-DESCRIPTION ?= "A small application container which will run \
-                the application defined in IMAGE_INSTALL."
-HOMEPAGE ?= "http://www.windriver.com"
-
 LICENSE ?= "MIT"
 LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
@@ -11,8 +6,6 @@ IMAGE_FSTYPES_remove = "live"
 
 TARGETNAME ?= "c3-app-container"
 
-IMAGE_INSTALL += ""
-
 IMAGE_FEATURES = ""
 
 inherit image
diff --git a/meta-cube/recipes-core/images/c3-systemd-container.inc b/meta-cube/classes/c3-systemd-container.bbclass
similarity index 86%
rename from meta-cube/recipes-core/images/c3-systemd-container.inc
rename to meta-cube/classes/c3-systemd-container.bbclass
index 950bef84..a264bbae 100644
--- a/meta-cube/recipes-core/images/c3-systemd-container.inc
+++ b/meta-cube/classes/c3-systemd-container.bbclass
@@ -1,18 +1,13 @@
-SUMMARY ?= "Sample systemd system container"
-DESCRIPTION ?= "A small systemd system container which will run \
-                the application defined in IMAGE_INSTALL."
-HOMEPAGE ?= "http://www.windriver.com"
-
 LICENSE ?= "MIT"
 LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
 IMAGE_FSTYPES ?= "tar.bz2"
 IMAGE_FSTYPES_remove = "live"
 
-TARGETNAME ?= "c3-systemd-container"
-
 IMAGE_INSTALL_append += "systemd"
 
+TARGETNAME ?= "c3-systemd-container"
+
 IMAGE_FEATURES = ""
 
 NO_RECOMMENDATIONS = "1"
diff --git a/meta-cube/recipes-core/images/c3-app-container_1.0.bb b/meta-cube/recipes-core/images/c3-app-container_1.0.bb
index 6d0c172b..5e0a1c13 100644
--- a/meta-cube/recipes-core/images/c3-app-container_1.0.bb
+++ b/meta-cube/recipes-core/images/c3-app-container_1.0.bb
@@ -3,6 +3,6 @@ DESCRIPTION = "A small application container which will run \
                 ${C3_APP_CONTAINER_APP}."
 HOMEPAGE = "http://www.windriver.com"
 
-require c3-app-container.inc
+inherit c3-app-container
 
 IMAGE_INSTALL += "${C3_APP_CONTAINER_APP}"
diff --git a/meta-cube/recipes-core/images/c3-systemd-container_1.0.bb b/meta-cube/recipes-core/images/c3-systemd-container_1.0.bb
index 428c56f3..2fcbd9b5 100644
--- a/meta-cube/recipes-core/images/c3-systemd-container_1.0.bb
+++ b/meta-cube/recipes-core/images/c3-systemd-container_1.0.bb
@@ -14,4 +14,4 @@ SERVICES_TO_DISABLE_append += "${C3_SYSTEMD_CONTAINER_DISABLE_SERVICES}"
 # Use local.conf to enable systemd services
 SERVICES_TO_ENABLE += "${C3_SYSTEMD_CONTAINER_ENABLE_SERVICES}"
 
-require c3-systemd-container.inc
+inherit c3-systemd-container
diff --git a/meta-cube/recipes-core/images/cube-vrf_0.1.bb b/meta-cube/recipes-core/images/cube-vrf_0.1.bb
index 637df022..d98787fa 100644
--- a/meta-cube/recipes-core/images/cube-vrf_0.1.bb
+++ b/meta-cube/recipes-core/images/cube-vrf_0.1.bb
@@ -5,7 +5,7 @@ routing functions are managed by this container."
 
 HOMEPAGE = "http://www.windriver.com"
 
-require recipes-core/images/c3-app-container.inc
+inherit c3-app-container
 
 IMAGE_INSTALL += " \
     openvswitch \