diff --git a/apertis-image-mx6qsabrelite.yaml b/apertis-image-mx6qsabrelite.yaml
index b1fdd2a1f995171291fe11bec6879d34fd58133a..2976e090e7c572dabaac697d161592c203c0a97e 100644
--- a/apertis-image-mx6qsabrelite.yaml
+++ b/apertis-image-mx6qsabrelite.yaml
@@ -12,14 +12,17 @@
 {{ if eq $type "minimal" }}
 {{ $demopack := "disabled" }}
 {{ end }}
+{{- $included_recipe := or .included_recipe "false"}}
 
 architecture: {{ $architecture }}
 
 actions:
+{{- if ne $included_recipe "true" }}
   - action: unpack
     description: Unpack {{ $ospack }}
     compression: gz
     file: {{ $ospack }}.tar.gz
+{{- end }}
 
   # Add multimedia demo pack
   # Provide URL via '-t demopack:"https://images.apertis.org/media/multimedia-demo.tar.gz"'
diff --git a/apertis-image-sdk.yaml b/apertis-image-sdk.yaml
index 8f98c174345995343bade7c2ea3270ad347dfb2e..44dc9c42e9408262e98c675234c2dcfa822889c8 100644
--- a/apertis-image-sdk.yaml
+++ b/apertis-image-sdk.yaml
@@ -17,14 +17,18 @@
 {{ $devroot_arch := or .devroot_arch "armhf" }}
 {{ $devpack := or .devpack (printf "ospack_%s-%s-%s_%s" $suite $devroot_arch "devroot" $timestamp) }}
 
+{{- $included_recipe := or .included_recipe "false"}}
+
 architecture: {{ $architecture }}
 
 actions:
 
+{{- if ne $included_recipe "true" }}
   - action: unpack
     description: Unpack {{ $ospack }}
     compression: gz
     file: {{ $ospack }}.tar.gz
+{{- end }}
 
   # Add multimedia demo pack
   # Provide URL via '-t demopack:"https://images.apertis.org/media/multimedia-demo.tar.gz"'
diff --git a/apertis-image-uboot.yaml b/apertis-image-uboot.yaml
index df191833372eb0615376488372de6b6afbef6fb9..5a9cad3e3957a49e0407715dc5eb03c0d239d0a2 100644
--- a/apertis-image-uboot.yaml
+++ b/apertis-image-uboot.yaml
@@ -13,13 +13,17 @@
 {{ $demopack := "disabled" }}
 {{ end }}
 
+{{- $included_recipe := or .included_recipe "false"}}
+
 architecture: {{ $architecture }}
 
 actions:
+{{- if ne $included_recipe "true" }}
   - action: unpack
     description: Unpack {{ $ospack }}
     compression: gz
     file: {{ $ospack }}.tar.gz
+{{- end }}
 
   # Add multimedia demo pack
   # Provide URL via '-t demopack:"https://images.apertis.org/media/multimedia-demo.tar.gz"'
diff --git a/apertis-image-uefi.yaml b/apertis-image-uefi.yaml
index 03e43dbd8d6791cc8a9da57af3b76d255ee07b90..fdf78bcd622e67e8018194ab49c1d544a7bf5cd8 100644
--- a/apertis-image-uefi.yaml
+++ b/apertis-image-uefi.yaml
@@ -13,13 +13,17 @@
 {{ $demopack := "disabled" }}
 {{ end }}
 
+{{- $included_recipe := or .included_recipe "false"}}
+
 architecture: {{ $architecture }}
 
 actions:
+{{- if ne $included_recipe "true" }}
   - action: unpack
     description: Unpack {{ $ospack }}
     compression: gz
     file: {{ $ospack }}.tar.gz
+{{- end }}
 
   # Add multimedia demo pack
   # Provide URL via '-t demopack:"https://images.apertis.org/media/multimedia-demo.tar.gz"'
diff --git a/apertis-ospack-basesdk.yaml b/apertis-ospack-basesdk.yaml
index fa80d499b6c718af5fd78268d353dfc2969384e1..0be3d9449dca4028550f5725403b992f624a5467 100644
--- a/apertis-ospack-basesdk.yaml
+++ b/apertis-ospack-basesdk.yaml
@@ -4,6 +4,7 @@
 {{- $suite := or .suite "18.12" -}}
 {{- $timestamp := or .timestamp "00000000.0" -}}
 {{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
+{{- $included_recipe := or .included_recipe "false"}}
 
 architecture: {{ $architecture }}
 
@@ -543,6 +544,7 @@ actions:
     chroot: true
     script: scripts/generate_locales.sh
 
+{{- if ne $included_recipe "true" }}
   - action: run
     description: "Save installed package status"
     chroot: false
@@ -556,3 +558,4 @@ actions:
   - action: pack
     compression: gz
     file: {{ $ospack }}.tar.gz
+{{- end }}
diff --git a/apertis-ospack-minimal.yaml b/apertis-ospack-minimal.yaml
index f8c7b9d0c98d6a0f35ff94de752dee62a38a7282..209b0a5913ff63f3bd426697717060529238ec0c 100644
--- a/apertis-ospack-minimal.yaml
+++ b/apertis-ospack-minimal.yaml
@@ -5,6 +5,7 @@
 {{- $timestamp := or .timestamp "00000000.0" -}}
 {{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
 {{- $lxc := or .lxc "enabled" -}}
+{{- $included_recipe := or .included_recipe "false"}}
 
 architecture: {{ $architecture }}
 
@@ -122,6 +123,7 @@ actions:
     chroot: true
     script: scripts/generate_locales.sh
 
+{{- if ne $included_recipe "true" }}
   - action: run
     description: "Save installed package status"
     chroot: false
@@ -135,3 +137,4 @@ actions:
   - action: pack
     compression: gz
     file: {{ $ospack }}.tar.gz
+{{- end }}
diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml
index 124f32aee00a6458c810fdb23054f650a3ab0f41..4a45cc9cbf33a120f19bf187f783a2324894bb1a 100644
--- a/apertis-ospack-sdk.yaml
+++ b/apertis-ospack-sdk.yaml
@@ -5,6 +5,7 @@
 {{- $timestamp := or .timestamp "00000000.0" -}}
 {{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
 {{- $lxc := or .lxc "enabled" -}}
+{{- $included_recipe := or .included_recipe "false"}}
 
 architecture: {{ $architecture }}
 
@@ -740,6 +741,7 @@ actions:
     chroot: true
     script: scripts/generate_locales.sh
 
+{{- if ne $included_recipe "true" }}
   - action: run
     description: "Save installed package status"
     chroot: false
@@ -753,3 +755,4 @@ actions:
   - action: pack
     compression: gz
     file: {{ $ospack }}.tar.gz
+{{- end }}
diff --git a/apertis-ospack-target.yaml b/apertis-ospack-target.yaml
index efdf864affdaaf048129172e8583b6999fd820f9..cbef873decad562fc662b04e27e9d8225a5a4cb7 100644
--- a/apertis-ospack-target.yaml
+++ b/apertis-ospack-target.yaml
@@ -6,6 +6,7 @@
 {{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
 {{- $ivitools := or .ivitools "enabled" -}}
 {{- $lxc := or .lxc "enabled" -}}
+{{- $included_recipe := or .included_recipe "false"}}
 
 architecture: {{ $architecture }}
 
@@ -247,6 +248,7 @@ actions:
     chroot: true
     script: scripts/generate_locales.sh
 
+{{- if ne $included_recipe "true" }}
   - action: run
     description: "Save installed package status"
     chroot: false
@@ -260,3 +262,4 @@ actions:
   - action: pack
     compression: gz
     file: {{ $ospack }}.tar.gz
+{{- end }}
diff --git a/apertis-sample-ospack-mx6qsabrelite.yaml b/apertis-sample-ospack-mx6qsabrelite.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0174c579b39fef6133402d813a9049bee2ba86ef
--- /dev/null
+++ b/apertis-sample-ospack-mx6qsabrelite.yaml
@@ -0,0 +1,28 @@
+{{- $architecture := "armhf" }}
+{{- $type := "minimal" }}
+{{- $mirror := "https://repositories.apertis.org/apertis/" }}
+{{- $suite := "18.12" }}
+{{- $timestamp := "00000000.0" }}
+{{- $image := (printf "apertis-sample-%s-%s-%s_%s" $suite  $type $architecture $timestamp) }}
+
+architecture: {{ $architecture }}
+
+actions:
+  - action: recipe
+    description: Create ospack for {{ $suite }} {{ $type }} {{ $architecture }}
+    recipe: apertis-ospack-{{ $type }}.yaml
+    variables:
+      type: {{ $type }}
+      mirror: {{ $mirror }}
+      suite: {{ $suite }}
+      timestamp: {{ $timestamp }}
+
+  - action: recipe
+    description: Create image {{ $image }} for {{ $suite }} {{ $type }} {{ $architecture }}
+    recipe: apertis-image-mx6qsabrelite.yaml
+    variables:
+      type: {{ $type }}
+      mirror: {{ $mirror }}
+      suite: {{ $suite }}
+      timestamp: {{ $timestamp }}
+      image: {{ $image }}