diff --git a/Jenkinsfile b/Jenkinsfile
index 68a363dca7f55ca09b1bf7b299b0f75f40fc4c62..39e70a0683d393c0a97a5df9c82e8cf7c796f4dc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -279,7 +279,7 @@ def buildOSpack(architecture, type, debosarguments = "") {
             -t suite:${release} \
             -t timestamp:${PIPELINE_VERSION} \
             -t ospack:ospack_${release}-${architecture}-${type}_${PIPELINE_VERSION} \
-            ${WORKSPACE}/${osname}-ospack.yaml""")
+            ${WORKSPACE}/${osname}-ospack-${type}.yaml""")
     }
 }
 
diff --git a/apertis-ospack.yaml b/apertis-ospack-basesdk.yaml
similarity index 96%
rename from apertis-ospack.yaml
rename to apertis-ospack-basesdk.yaml
index 069d5c4d652236a1b65702f4568903b559c11237..b31a5eb6db74a49ce9f1c0259b0f39757c13dba7 100644
--- a/apertis-ospack.yaml
+++ b/apertis-ospack-basesdk.yaml
@@ -38,23 +38,17 @@ actions:
   {{ end }}
 
   # Add type-based apt sources list
-  {{- if eq $type "development" "sdk" "basesdk" }}
   - action: run
     chroot: true
     script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} development
-  {{- end }}
 
-  {{- if eq $type "sdk" "basesdk" }}
   - action: run
     chroot: true
     script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} sdk
-  {{- end }}
 
-  {{- if eq $type "development" "sdk" "basesdk" }}
   - action: run
     chroot: true
     script: scripts/replace-tar-coreutils-for-build.sh
-  {{- end }}
 
   - action: apt
     description: "Core packages"
@@ -100,7 +94,6 @@ actions:
       - openssh-server
       - vim.tiny
 
-  {{- if eq $type "target" "development" "sdk" "basesdk" }}
   {{ if eq $ivitools "enabled" }}
   - action: apt
     description: "HMI packages"
@@ -116,13 +109,6 @@ actions:
       - xwayland
   {{ end }}
 
-  {{ if eq $type "target" "development" }}
-  - action: apt
-    description: "Target and development only packages"
-    packages:
-      - chaiwala-user-session-wayland
-  {{ end }}
-
   - action: apt
     description: "Target packages"
     packages:
@@ -218,9 +204,7 @@ actions:
       - syncevolution
       - tinwell
   {{ end }}
-  {{- end -}}
 
-  {{- if eq $type "development" "sdk" "basesdk" }}
   {{ if eq $lxc "enabled" }}
   - action: apt
     description: "LXC packages"
@@ -387,9 +371,7 @@ actions:
       - shapwick-dev
       - tinwell-dev
   {{ end }}
-  {{- end }}
 
-  {{- if eq $type "sdk" "basesdk" }}
   - action: apt
     description: "SDK packages"
     packages:
@@ -699,8 +681,6 @@ actions:
       - traprain-mock-service
   {{ end }}
 
-  {{- end }}
-
   - action: overlay
     source: overlays/arch-platform
 
@@ -730,7 +710,6 @@ actions:
     description: "Creating mount point /Applications"
     command: install -d -m 0755 /Applications
 
-  {{- if eq $type "sdk" "basesdk" }}
   {{ if eq $ivitools "enabled" }}
   - action: run
     description: "Setting up sysroot storage"
@@ -742,7 +721,6 @@ actions:
     description: "disable deprecated gnome-vfs-2.0 documentation"
     chroot: true
     script: scripts/disable-deprecated-gnome-vfs-2.0.sh
-  {{- end }}
 
   - action: run
     chroot: true
diff --git a/apertis-ospack-development.yaml b/apertis-ospack-development.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ec0efd94e9020256b1fe246bdd7ae992f031baea
--- /dev/null
+++ b/apertis-ospack-development.yaml
@@ -0,0 +1,438 @@
+{{- $architecture := or .architecture "amd64" }}
+{{- $type := or .type "minimal" -}}
+{{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
+{{- $suite := or .suite "18.06" -}}
+{{- $timestamp := or .timestamp "00000000.0" -}}
+{{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
+{{- $ivitools := or .ivitools "enabled" -}}
+{{- $lxc := or .lxc "enabled" -}}
+
+architecture: {{ $architecture }}
+
+actions:
+  - action: debootstrap
+    suite: {{ $suite }}
+    components:
+      - target
+    mirror: {{ $mirror }}
+    variant: minbase
+    keyring-package: apertis-archive-keyring
+    keyring-file: keyring/apertis-archive-keyring.gpg
+    merged-usr: false
+
+  # Add image version information
+  - action: run
+    description: "Setting up image version metadata"
+    chroot: true
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+
+  # Extend apt sources list
+  - action: run
+    chroot: true
+    script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} target
+
+  {{ if eq $ivitools "enabled" }}
+  - action: run
+    chroot: true
+    script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} hmi helper-libs
+  {{ end }}
+
+  # Add type-based apt sources list
+  - action: run
+    chroot: true
+    script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} development
+
+  - action: run
+    chroot: true
+    script: scripts/replace-tar-coreutils-for-build.sh
+
+  - action: apt
+    description: "Core packages"
+    packages:
+      - sudo
+      - apt-transport-https
+      - apertis-customizations
+      - initramfs-tools
+
+  - action: apt
+    description: "Base packages"
+    packages:
+      - busybox
+      - busybox-initramfs
+      - dbus-user-session
+
+  - action: apt
+    description: "Networking packages"
+    packages:
+      - connman
+      - wpasupplicant
+
+  - action: apt
+    description: "AppArmor packages"
+    packages:
+      - apparmor
+      - chaiwala-apparmor-profiles
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "Application framework packages"
+    packages:
+      - canterbury-core
+      - newport
+      - ribchester-core
+  {{ end }}
+
+  - action: apt
+    description: "Test environment packages"
+    packages:
+      - net-tools
+      - openssh-client
+      - openssh-server
+      - vim.tiny
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "HMI packages"
+    packages:
+      - eye
+      - frampton
+      - mildenhall
+      - mildenhall-compositor
+      - mildenhall-launcher
+      - mildenhall-popup-layer
+      - mildenhall-settings
+      - mildenhall-statusbar
+      - xwayland
+  {{ end }}
+
+  - action: apt
+    description: "Target user session packages"
+    packages:
+      - chaiwala-user-session-wayland
+
+  - action: apt
+    description: "Target packages"
+    packages:
+      - adduser
+      - apertis-archive-keyring
+      - apertis-customizations
+      - apparmor
+      - apparmor-profiles
+      - apt
+      - apt-transport-https
+      - apt-utils
+      - auditd
+      - avahi-daemon
+      - bluez
+      - bluez-obexd
+      - btrfs-tools
+      - busybox-initramfs
+      - bzip2
+      - ca-certificates
+      - chaiwala-apparmor-profiles
+      - connman
+      - debconf-i18n
+      - evolution-data-server
+      - file
+      - fonts-dejavu-extra
+      - gnupg
+      - gstreamer1.0-clutter-3.0
+      - gstreamer1.0-plugins-good
+      - gstreamer1.0-pulseaudio
+      - gvfs
+      - initramfs-tools
+      - iproute
+      - iptables
+      - kmod
+      - libgupnp-1.0-4
+      - liblockfile-bin
+      - libnss-myhostname
+      - libproxy1-pacrunner
+      - libwebkit2gtk-4.0-37
+      - linux-firmware
+      - locales
+      - lsb-base
+      - lzma
+      - mawk
+      - mobile-broadband-provider-info
+      - mutter
+      - net-tools
+      - netbase
+      - openssh-client
+      - openssh-server
+      - pacrunner
+      - plymouth
+      - plymouth-themes
+      - policykit-1
+      - pulseaudio
+      - pulseaudio-module-bluetooth
+      - pulseaudio-module-x11
+      - pulseaudio-utils
+      - sudo
+      - systemd-sysv
+      - tcmmd
+      - tracker
+      - tracker-miner-fs
+      - tumbler
+      - tumbler-plugins-extra
+      - udev
+      - usb-modeswitch
+      - vim-tiny
+      - whiptail
+      - wpasupplicant
+      - xauth
+      - xdg-user-dirs
+      - xwayland
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "Target packages (CM)"
+    packages:
+      - barkway
+      - beckfoot
+      - canterbury
+      - didcot
+      - dlt-daemon
+      - frome
+      - geoclue
+      - grilo-plugins-0.2
+      - newport
+      - ofono
+      - prestwood
+      - rhosydd
+      - ribchester
+      - shapwick
+      - syncevolution
+      - tinwell
+  {{ end }}
+
+  {{ if eq $lxc "enabled" }}
+  - action: apt
+    description: "LXC packages"
+    packages:
+      - libpam-cgfs
+      - lxc
+      - lxc-templates
+      - uidmap
+
+  - action: overlay
+    description: "Install the Apertis template to LXC"
+    source: lxc/lxc-apertis-ostree
+    destination: /usr/share/lxc/templates/lxc-apertis-ostree
+
+  - action: run
+    description: "Set executable bit on Apertis LXC template"
+    chroot: true
+    command: chmod a+x /usr/share/lxc/templates/lxc-apertis-ostree
+  {{ end }}
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "Development HMI packages"
+    packages:
+      - mildenhall-dev
+  {{ end }}
+
+  - action: apt
+    description: "Development packages"
+    packages:
+      - apparmor-utils
+      - automake
+      - autopoint
+      - autotools-dev
+      - bash
+      - bison
+      - build-essential
+      - bustle-pcap
+      - chrpath
+      - clutter-1.0-tests
+      - cmake
+      - cmake-data
+      - connman-tests
+      - d-feet
+      - debhelper
+      - dosfstools
+      - evolution-data-server-dbg
+      - evolution-data-server-dev
+      - fakeroot
+      - flex
+      - gawk
+      - gcc
+      - gdb
+      - gdbserver
+      - gir1.2-secret-1
+      - git
+      - gperf
+      - gstreamer1.0-tools
+      - gtk-doc-tools
+      - iputils-ping
+      - less
+      - libasound2-dev
+      - libbluetooth-dev
+      - libclutter-1.0-dbg
+      - libclutter-1.0-dev
+      - libclutter-gst-3.0-dev
+      - libclutter-gtk-1.0-dev
+      - libcogl-dev
+      - libcurl4-nss-dev
+      - libenchant-dev
+      - libffi-dev
+      - libgirepository1.0-dev
+      - libglib2.0-0-dbg
+      - libglib2.0-dev
+      - libgnomevfs2-dev
+      - libgstreamer-plugins-base1.0-dev
+      - libgstreamer1.0-dev
+      - libgtk2.0-dev
+      - libgtk-3-0-dbg
+      - libgudev-1.0-dev
+      - libgupnp-1.0-dev
+      - libhyphen-dev
+      - libicu-dev
+      - libjpeg-dev
+      - libjsoncpp1
+      - libmutter-dev
+      - libmx-2.0-0-dev
+      - libnotify-dev
+      - libpango1.0-dev
+      - libpng-dev
+      - libpoppler-glib-dev
+      - libproxy-dev
+      - libpulse-dev
+      - libsecret-1-0
+      - libsecret-1-dev
+      - libsecret-common
+      - libsoup2.4-dev
+      - libsqlite3-dev
+      - libtool
+      - libtracker-control-1.0-dev
+      - libtracker-miner-1.0-dev
+      - libtracker-sparql-1.0-dev
+      - libwebkit2gtk-4.0-dev
+      - libwebp-dev
+      - libwnck-3-dev
+      - libxslt1-dev
+      - libxt-dev
+  {{ if eq $architecture "armhf" }}
+      - linux-headers-armmp
+  {{ else }}
+      - linux-headers-{{$architecture}}
+  {{ end }}
+      - lsb-release
+      - ltrace
+      - openssh-client
+      - openssh-server
+      - pavucontrol
+      - pkg-config
+      - python-pkg-resources
+      - python-ply
+      - ruby
+      - slimit
+      - strace
+      - symlinks
+      - syncevolution-dbg
+      - valgrind
+      - wget
+      - xinput
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "Development packages (CM)"
+    packages:
+      - barkway-dev
+      - beckfoot-dev
+      - canterbury-dev
+      - folks-tools
+      - frome
+      - geoclue-2.0
+      - libchamplain-0.12-dev
+      - libclapton-dev
+      - libdidcot-0-dev
+      - libfolks-dbg
+      - libfolks-dev
+      - libfolks-eds-dbg
+      - libfolks-eds-dev
+      - libfolks-telepathy-dbg
+      - libfolks-telepathy-dev
+      - libfrome-0-dev
+      - libgeoclue-dev
+      - libgrassmoor-dev
+      - libgupnp-av-1.0-dev
+      - liblightwood-dev
+      - libmrss0-dev
+      - libseaton-dev
+      - libtelepathy-farstream-dev
+      - libtelepathy-glib-dev
+      - libtelepathy-glib0-dbg
+      - libthornbury-dev
+      - libwebsockets-dev
+      - newport-dev
+      - prestwood-dev
+      - ribchester-dev
+      - shapwick-dev
+      - tinwell-dev
+  {{ end }}
+
+  - action: overlay
+    source: overlays/arch-platform
+
+  - action: overlay
+    source: {{ printf "overlays/arch-%s" $type }}
+
+  - action: overlay
+    source: {{ printf "overlays/%s-platform" $architecture }}
+
+  - action: overlay
+    source: {{ printf "overlays/%s-%s" $architecture $type }}
+
+  - action: run
+    chroot: true
+    script: scripts/add-xdg-user-metadata.sh
+
+  - action: run
+    chroot: true
+    script: scripts/create-mtab-symlink.hook.sh
+
+  - action: run
+    chroot: true
+    script: scripts/setup_user.sh
+
+  - action: run
+    chroot: true
+    description: "Creating mount point /Applications"
+    command: install -d -m 0755 /Applications
+
+  - action: run
+    chroot: true
+    script: scripts/add_user_to_groups.sh
+
+  - action: run
+    chroot: true
+    script: scripts/check_sudoers_for_admin.sh
+
+  - action: run
+    chroot: true
+    script: scripts/generate_openssh_keys.sh
+
+  - action: run
+    chroot: true
+    script: scripts/add-initramfs-modules.sh
+
+  - action: run
+    description: "Generate locales"
+    chroot: true
+    script: scripts/generate_locales.sh
+
+  - action: run
+    description: "Save installed package status"
+    chroot: false
+    command: gzip -c "${ROOTDIR}/var/lib/dpkg/status" > "${ARTIFACTDIR}/{{ $ospack }}.pkglist.gz"
+
+  - action: run
+    description: List files on {{ $ospack }}
+    chroot: false
+    script: scripts/list-files "$ROOTDIR" | gzip > "${ARTIFACTDIR}/{{ $ospack }}.filelist.gz"
+
+  - action: pack
+    compression: gz
+    file: {{ $ospack }}.tar.gz
diff --git a/apertis-ospack-minimal.yaml b/apertis-ospack-minimal.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..dc042ee6fdaf0c0d912297d7ec6db987da0d016b
--- /dev/null
+++ b/apertis-ospack-minimal.yaml
@@ -0,0 +1,146 @@
+{{- $architecture := or .architecture "amd64" }}
+{{- $type := or .type "minimal" -}}
+{{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
+{{- $suite := or .suite "18.06" -}}
+{{- $timestamp := or .timestamp "00000000.0" -}}
+{{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
+{{- $ivitools := or .ivitools "enabled" -}}
+{{- $lxc := or .lxc "enabled" -}}
+
+architecture: {{ $architecture }}
+
+actions:
+  - action: debootstrap
+    suite: {{ $suite }}
+    components:
+      - target
+    mirror: {{ $mirror }}
+    variant: minbase
+    keyring-package: apertis-archive-keyring
+    keyring-file: keyring/apertis-archive-keyring.gpg
+    merged-usr: false
+
+  # Add image version information
+  - action: run
+    description: "Setting up image version metadata"
+    chroot: true
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+
+  # Extend apt sources list
+  - action: run
+    chroot: true
+    script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} target
+
+  {{ if eq $ivitools "enabled" }}
+  - action: run
+    chroot: true
+    script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} hmi helper-libs
+  {{ end }}
+
+  - action: apt
+    description: "Core packages"
+    packages:
+      - sudo
+      - apt-transport-https
+      - apertis-customizations
+      - initramfs-tools
+
+  - action: apt
+    description: "Base packages"
+    packages:
+      - busybox
+      - busybox-initramfs
+      - dbus-user-session
+
+  - action: apt
+    description: "Networking packages"
+    packages:
+      - connman
+      - wpasupplicant
+
+  - action: apt
+    description: "AppArmor packages"
+    packages:
+      - apparmor
+      - chaiwala-apparmor-profiles
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "Application framework packages"
+    packages:
+      - canterbury-core
+      - newport
+      - ribchester-core
+  {{ end }}
+
+  - action: apt
+    description: "Test environment packages"
+    packages:
+      - net-tools
+      - openssh-client
+      - openssh-server
+      - vim.tiny
+
+  - action: overlay
+    source: overlays/arch-platform
+
+  - action: overlay
+    source: {{ printf "overlays/arch-%s" $type }}
+
+  - action: overlay
+    source: {{ printf "overlays/%s-platform" $architecture }}
+
+  - action: overlay
+    source: {{ printf "overlays/%s-%s" $architecture $type }}
+
+  - action: run
+    chroot: true
+    script: scripts/add-xdg-user-metadata.sh
+
+  - action: run
+    chroot: true
+    script: scripts/create-mtab-symlink.hook.sh
+
+  - action: run
+    chroot: true
+    script: scripts/setup_user.sh
+
+  - action: run
+    chroot: true
+    description: "Creating mount point /Applications"
+    command: install -d -m 0755 /Applications
+
+  - action: run
+    chroot: true
+    script: scripts/add_user_to_groups.sh
+
+  - action: run
+    chroot: true
+    script: scripts/check_sudoers_for_admin.sh
+
+  - action: run
+    chroot: true
+    script: scripts/generate_openssh_keys.sh
+
+  - action: run
+    chroot: true
+    script: scripts/add-initramfs-modules.sh
+
+  - action: run
+    description: "Generate locales"
+    chroot: true
+    script: scripts/generate_locales.sh
+
+  - action: run
+    description: "Save installed package status"
+    chroot: false
+    command: gzip -c "${ROOTDIR}/var/lib/dpkg/status" > "${ARTIFACTDIR}/{{ $ospack }}.pkglist.gz"
+
+  - action: run
+    description: List files on {{ $ospack }}
+    chroot: false
+    script: scripts/list-files "$ROOTDIR" | gzip > "${ARTIFACTDIR}/{{ $ospack }}.filelist.gz"
+
+  - action: pack
+    compression: gz
+    file: {{ $ospack }}.tar.gz
diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b31a5eb6db74a49ce9f1c0259b0f39757c13dba7
--- /dev/null
+++ b/apertis-ospack-sdk.yaml
@@ -0,0 +1,758 @@
+{{- $architecture := or .architecture "amd64" }}
+{{- $type := or .type "minimal" -}}
+{{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
+{{- $suite := or .suite "18.06" -}}
+{{- $timestamp := or .timestamp "00000000.0" -}}
+{{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
+{{- $ivitools := or .ivitools "enabled" -}}
+{{- $lxc := or .lxc "enabled" -}}
+
+architecture: {{ $architecture }}
+
+actions:
+  - action: debootstrap
+    suite: {{ $suite }}
+    components:
+      - target
+    mirror: {{ $mirror }}
+    variant: minbase
+    keyring-package: apertis-archive-keyring
+    keyring-file: keyring/apertis-archive-keyring.gpg
+    merged-usr: false
+
+  # Add image version information
+  - action: run
+    description: "Setting up image version metadata"
+    chroot: true
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+
+  # Extend apt sources list
+  - action: run
+    chroot: true
+    script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} target
+
+  {{ if eq $ivitools "enabled" }}
+  - action: run
+    chroot: true
+    script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} hmi helper-libs
+  {{ end }}
+
+  # Add type-based apt sources list
+  - action: run
+    chroot: true
+    script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} development
+
+  - action: run
+    chroot: true
+    script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} sdk
+
+  - action: run
+    chroot: true
+    script: scripts/replace-tar-coreutils-for-build.sh
+
+  - action: apt
+    description: "Core packages"
+    packages:
+      - sudo
+      - apt-transport-https
+      - apertis-customizations
+      - initramfs-tools
+
+  - action: apt
+    description: "Base packages"
+    packages:
+      - busybox
+      - busybox-initramfs
+      - dbus-user-session
+
+  - action: apt
+    description: "Networking packages"
+    packages:
+      - connman
+      - wpasupplicant
+
+  - action: apt
+    description: "AppArmor packages"
+    packages:
+      - apparmor
+      - chaiwala-apparmor-profiles
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "Application framework packages"
+    packages:
+      - canterbury-core
+      - newport
+      - ribchester-core
+  {{ end }}
+
+  - action: apt
+    description: "Test environment packages"
+    packages:
+      - net-tools
+      - openssh-client
+      - openssh-server
+      - vim.tiny
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "HMI packages"
+    packages:
+      - eye
+      - frampton
+      - mildenhall
+      - mildenhall-compositor
+      - mildenhall-launcher
+      - mildenhall-popup-layer
+      - mildenhall-settings
+      - mildenhall-statusbar
+      - xwayland
+  {{ end }}
+
+  - action: apt
+    description: "Target packages"
+    packages:
+      - adduser
+      - apertis-archive-keyring
+      - apertis-customizations
+      - apparmor
+      - apparmor-profiles
+      - apt
+      - apt-transport-https
+      - apt-utils
+      - auditd
+      - avahi-daemon
+      - bluez
+      - bluez-obexd
+      - btrfs-tools
+      - busybox-initramfs
+      - bzip2
+      - ca-certificates
+      - chaiwala-apparmor-profiles
+      - connman
+      - debconf-i18n
+      - evolution-data-server
+      - file
+      - fonts-dejavu-extra
+      - gnupg
+      - gstreamer1.0-clutter-3.0
+      - gstreamer1.0-plugins-good
+      - gstreamer1.0-pulseaudio
+      - gvfs
+      - initramfs-tools
+      - iproute
+      - iptables
+      - kmod
+      - libgupnp-1.0-4
+      - liblockfile-bin
+      - libnss-myhostname
+      - libproxy1-pacrunner
+      - libwebkit2gtk-4.0-37
+      - linux-firmware
+      - locales
+      - lsb-base
+      - lzma
+      - mawk
+      - mobile-broadband-provider-info
+      - mutter
+      - net-tools
+      - netbase
+      - openssh-client
+      - openssh-server
+      - pacrunner
+      - plymouth
+      - plymouth-themes
+      - policykit-1
+      - pulseaudio
+      - pulseaudio-module-bluetooth
+      - pulseaudio-module-x11
+      - pulseaudio-utils
+      - sudo
+      - systemd-sysv
+      - tcmmd
+      - tracker
+      - tracker-miner-fs
+      - tumbler
+      - tumbler-plugins-extra
+      - udev
+      - usb-modeswitch
+      - vim-tiny
+      - whiptail
+      - wpasupplicant
+      - xauth
+      - xdg-user-dirs
+      - xwayland
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "Target packages (CM)"
+    packages:
+      - barkway
+      - beckfoot
+      - canterbury
+      - didcot
+      - dlt-daemon
+      - frome
+      - geoclue
+      - grilo-plugins-0.2
+      - newport
+      - ofono
+      - prestwood
+      - rhosydd
+      - ribchester
+      - shapwick
+      - syncevolution
+      - tinwell
+  {{ end }}
+
+  {{ if eq $lxc "enabled" }}
+  - action: apt
+    description: "LXC packages"
+    packages:
+      - libpam-cgfs
+      - lxc
+      - lxc-templates
+      - uidmap
+
+  - action: overlay
+    description: "Install the Apertis template to LXC"
+    source: lxc/lxc-apertis-ostree
+    destination: /usr/share/lxc/templates/lxc-apertis-ostree
+
+  - action: run
+    description: "Set executable bit on Apertis LXC template"
+    chroot: true
+    command: chmod a+x /usr/share/lxc/templates/lxc-apertis-ostree
+  {{ end }}
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "Development HMI packages"
+    packages:
+      - mildenhall-dev
+  {{ end }}
+
+  - action: apt
+    description: "Development packages"
+    packages:
+      - apparmor-utils
+      - automake
+      - autopoint
+      - autotools-dev
+      - bash
+      - bison
+      - build-essential
+      - bustle-pcap
+      - chrpath
+      - clutter-1.0-tests
+      - cmake
+      - cmake-data
+      - connman-tests
+      - d-feet
+      - debhelper
+      - dosfstools
+      - evolution-data-server-dbg
+      - evolution-data-server-dev
+      - fakeroot
+      - flex
+      - gawk
+      - gcc
+      - gdb
+      - gdbserver
+      - gir1.2-secret-1
+      - git
+      - gperf
+      - gstreamer1.0-tools
+      - gtk-doc-tools
+      - iputils-ping
+      - less
+      - libasound2-dev
+      - libbluetooth-dev
+      - libclutter-1.0-dbg
+      - libclutter-1.0-dev
+      - libclutter-gst-3.0-dev
+      - libclutter-gtk-1.0-dev
+      - libcogl-dev
+      - libcurl4-nss-dev
+      - libenchant-dev
+      - libffi-dev
+      - libgirepository1.0-dev
+      - libglib2.0-0-dbg
+      - libglib2.0-dev
+      - libgnomevfs2-dev
+      - libgstreamer-plugins-base1.0-dev
+      - libgstreamer1.0-dev
+      - libgtk2.0-dev
+      - libgtk-3-0-dbg
+      - libgudev-1.0-dev
+      - libgupnp-1.0-dev
+      - libhyphen-dev
+      - libicu-dev
+      - libjpeg-dev
+      - libjsoncpp1
+      - libmutter-dev
+      - libmx-2.0-0-dev
+      - libnotify-dev
+      - libpango1.0-dev
+      - libpng-dev
+      - libpoppler-glib-dev
+      - libproxy-dev
+      - libpulse-dev
+      - libsecret-1-0
+      - libsecret-1-dev
+      - libsecret-common
+      - libsoup2.4-dev
+      - libsqlite3-dev
+      - libtool
+      - libtracker-control-1.0-dev
+      - libtracker-miner-1.0-dev
+      - libtracker-sparql-1.0-dev
+      - libwebkit2gtk-4.0-dev
+      - libwebp-dev
+      - libwnck-3-dev
+      - libxslt1-dev
+      - libxt-dev
+  {{ if eq $architecture "armhf" }}
+      - linux-headers-armmp
+  {{ else }}
+      - linux-headers-{{$architecture}}
+  {{ end }}
+      - lsb-release
+      - ltrace
+      - openssh-client
+      - openssh-server
+      - pavucontrol
+      - pkg-config
+      - python-pkg-resources
+      - python-ply
+      - ruby
+      - slimit
+      - strace
+      - symlinks
+      - syncevolution-dbg
+      - valgrind
+      - wget
+      - xinput
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "Development packages (CM)"
+    packages:
+      - barkway-dev
+      - beckfoot-dev
+      - canterbury-dev
+      - folks-tools
+      - frome
+      - geoclue-2.0
+      - libchamplain-0.12-dev
+      - libclapton-dev
+      - libdidcot-0-dev
+      - libfolks-dbg
+      - libfolks-dev
+      - libfolks-eds-dbg
+      - libfolks-eds-dev
+      - libfolks-telepathy-dbg
+      - libfolks-telepathy-dev
+      - libfrome-0-dev
+      - libgeoclue-dev
+      - libgrassmoor-dev
+      - libgupnp-av-1.0-dev
+      - liblightwood-dev
+      - libmrss0-dev
+      - libseaton-dev
+      - libtelepathy-farstream-dev
+      - libtelepathy-glib-dev
+      - libtelepathy-glib0-dbg
+      - libthornbury-dev
+      - libwebsockets-dev
+      - newport-dev
+      - prestwood-dev
+      - ribchester-dev
+      - shapwick-dev
+      - tinwell-dev
+  {{ end }}
+
+  - action: apt
+    description: "SDK packages"
+    packages:
+      - adduser
+      - ant
+      - ant-optional
+      - apertis-archive-keyring
+      - apertis-customizations
+      - apertis-dev-tools
+      - apertis-docs
+      - apparmor
+      - apparmor-profiles
+      - apparmor-utils
+      - apt
+      - apt-transport-https
+      - apt-utils
+      - auditd
+      - automake
+      - autopoint
+      - autotools-dev
+      - avahi-daemon
+      - bash
+      - bison
+      - blueman
+      - bluez
+      - bluez-obexd
+      - bmap-tools
+      - btrfs-tools
+      - build-essential
+      - bustle
+      - bustle-pcap
+      - busybox-initramfs
+      - bzip2
+      - ca-certificates
+      - ccache
+      - chaiwala-apparmor-profiles
+      - chaiwala-sdk-default-settings
+      - chrpath
+      - clang
+      - clutter-1.0-tests
+      - cmake
+      - cntlm
+      - connman
+      - connman-tests
+      - d-feet
+      - dbus-user-session
+      - debconf-i18n
+      - debhelper
+      - devhelp
+      - devilspie
+      - devscripts
+      - dh-autoreconf
+      - dh-exec
+      - dosfstools
+      - evince
+      - evolution-data-server
+      - evolution-data-server-dbg
+      - evolution-data-server-dev
+      - evolution-data-server-doc
+      - fakeroot
+      - file
+      - firefox
+      - flex
+      - g++-aarch64-linux-gnu
+      - g++-arm-linux-gnueabihf
+      - gawk
+      - gcc
+      - gcc-aarch64-linux-gnu
+      - gcc-arm-linux-gnueabihf
+      - gdb
+      - gdb-doc
+      - gdb-multiarch
+      - gdbserver
+      - gettext-doc
+      - gir1.2-secret-1
+      - git
+      - glibc-doc
+      - gnome-desktop-testing
+      - gnome-devel-docs
+      - gnome-icon-theme-full
+      - gnupg
+      - gperf
+      - gstreamer1.0-clutter-3.0
+      - gstreamer1.0-doc
+      - gstreamer1.0-plugins-good
+      - gstreamer1.0-pulseaudio
+      - gstreamer1.0-tools
+      - gtk-doc-tools
+      - hotdoc
+      - hotdoc-c-extension
+      - hotdoc-dbus-extension
+      - ibus-doc
+      - initramfs-tools
+      - iproute
+      - iptables
+      - iputils-ping
+      - kmod
+      - lcov
+      - less
+      - libasound2-dev
+      - libbluetooth-dev
+      - libcairo2-doc
+      - libclutter-1.0-dev
+      - libclutter-1.0-doc
+      - libclutter-gst-3.0-dev
+      - libclutter-gst-3.0-doc
+      - libclutter-gtk-1.0-dev
+      - libclutter-gtk-1.0-doc
+      - libcogl-dev
+      - libcogl-doc
+      - libcurl4-nss-dev
+      - libelf-dev
+      - libenchant-dev
+      - libffi-dev
+      - libgdata-doc
+      - libgirepository1.0-dev
+      - libglib2.0-dev
+      - libgnomevfs2-dev
+      - libgstreamer-plugins-base1.0-dev
+      - libgstreamer1.0-dev
+      - libgupnp-1.0-4
+      - libgupnp-1.0-dev
+      - libgupnp-doc
+      - libicu-dev
+      - libjpeg-dev
+      - libjson-glib-doc
+      - liblockfile-bin
+      - libmutter-dev
+      - libmx-2.0-0-dev
+      - libmx-2.0-doc
+      - libnss-myhostname
+      - libpango1.0-dev
+      - libpng-dev
+      - libpoppler-glib-dev
+      - libproxy-dev
+      - libproxy1-pacrunner
+      - libpulse-dev
+      - libsecret-1-0
+      - libsecret-1-dev
+      - libsecret-common
+      - libsoup2.4-dev
+      - libsoup2.4-doc
+      - libsqlite3-dev
+      - libtool
+      - libtracker-control-1.0-dev
+      - libtracker-control-doc
+      - libtracker-miner-1.0-dev
+      - libtracker-miner-doc
+      - libtracker-sparql-1.0-dev
+      - libtracker-sparql-doc
+      - libwebkit-clutter-dev
+      - libwebp-dev
+      - libwnck-3-dev
+      - libxml2-doc
+      - libxml2-utils
+      - libxslt1-dev
+      - libxt-dev
+      - lightdm
+      - linux-firmware
+      - linux-perf
+      - locales
+      - lsb-base
+      - lsb-release
+      - ltrace
+      - lzma
+      - mawk
+      - mousepad
+      - murrine-themes
+      - mutter
+      - net-tools
+      - netbase
+      - openssh-client
+      - openssh-server
+      - osc
+      - pacrunner
+      - pavucontrol
+      - pkg-config
+      - pkg-config-aarch64-linux-gnu
+      - pkg-config-arm-linux-gnueabihf
+      - pkg-config-x86-64-linux-gnu
+      - plymouth
+      - plymouth-themes
+      - policykit-1
+      - pristine-tar
+      - pulseaudio
+      - pulseaudio-module-bluetooth
+      - pulseaudio-module-x11
+      - pulseaudio-utils
+      - python-gobject
+      - python3-debian
+      - qemu-user-static
+      - rtkit
+      - ruby
+      - screen
+      - seed-doc
+      - splint
+      - splint-doc-html
+      - strace
+      - sudo
+      - symlinks
+      - syncevolution
+      - syncevolution-dbg
+      - sysprof
+      - systemd-sysv
+      - systemtap
+      - systemtap-client
+      - systemtap-server
+      - tar
+      - tartan
+      - tcmmd
+      - tracker
+      - tracker-miner-fs
+      - tumbler
+      - tumbler-plugins-extra
+      - udev
+      - usb-modeswitch
+      - usbutils
+      - valgrind
+      - vim-tiny
+      - wget
+      - whiptail
+      - wpasupplicant
+      - xauth
+      - xdg-user-dirs
+      - xfce4
+      - xfce4-terminal
+      - xinput
+      - xserver-xephyr
+      - xserver-xorg
+      - xserver-xorg-input-evdev
+      - xserver-xorg-video-fbdev
+      - xserver-xorg-video-intel
+      - xserver-xorg-video-vesa
+      # needed by the VirtualBox extensions for xrandr. (Apertis:T4485)
+      - x11-xserver-utils
+      - yelp
+      - yelp-tools
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "SDK packages (CM)"
+    packages:
+      - apertis-eclipse-plugins
+      - barkway-dev
+      - barkway-doc
+      - beckfoot-dev
+      - beckfoot-doc
+      - canterbury
+      - canterbury-dev
+      - didcot
+      - didcot-doc
+      - dlt-daemon
+      - eclipse
+      - eclipse-cdt
+      - eclipse-cdt-launch-remote
+      - eclipse-rcp
+      - folks-tools
+      - frome
+      - geoclue
+      - grilo-plugins-0.2
+      - libchamplain-0.12-dev
+      - libchamplain-doc
+      - libclapton-dev
+      - libclapton-doc
+      - libdidcot-0-dev
+      - libfolks-dbg
+      - libfolks-dev
+      - libfolks-eds-dbg
+      - libfolks-eds-dev
+      - libfolks-eds25
+      - libfolks-telepathy-dbg
+      - libfolks-telepathy-dev
+      - libfolks-telepathy25
+      - libgeoclue-dev
+      - libgrassmoor-dev
+      - libgrassmoor-doc
+      - libgrilo-0.2-doc
+      - libgupnp-av-1.0-dev
+      - liblightwood-dev
+      - liblightwood-doc
+      - libmrss0-dev
+      - libseaton-dev
+      - libseaton-doc
+      - libtelepathy-farstream-dev
+      - libtelepathy-glib-dev
+      - libtelepathy-glib-doc
+      - libtelepathy-glib0-dbg
+      - libtelepathy-logger-doc
+      - libthornbury-dev
+      - libthornbury-doc
+      - libtraprain-0-doc
+      - libtraprain-client-0-0
+      - libtraprain-client-0-dev
+      - libwebsockets-dev
+      - newport-dev
+      - newport-doc
+      - ofono
+      - prestwood-dev
+      - prestwood-doc
+      - rhosydd
+      - ribchester-dev
+      - ribchester-doc
+      - shapwick-dev
+      - shapwick-doc
+      - tinwell-dev
+      - tinwell-doc
+      - traprain-mock-service
+  {{ end }}
+
+  - action: overlay
+    source: overlays/arch-platform
+
+  - action: overlay
+    source: {{ printf "overlays/arch-%s" $type }}
+
+  - action: overlay
+    source: {{ printf "overlays/%s-platform" $architecture }}
+
+  - action: overlay
+    source: {{ printf "overlays/%s-%s" $architecture $type }}
+
+  - action: run
+    chroot: true
+    script: scripts/add-xdg-user-metadata.sh
+
+  - action: run
+    chroot: true
+    script: scripts/create-mtab-symlink.hook.sh
+
+  - action: run
+    chroot: true
+    script: scripts/setup_user.sh
+
+  - action: run
+    chroot: true
+    description: "Creating mount point /Applications"
+    command: install -d -m 0755 /Applications
+
+  {{ if eq $ivitools "enabled" }}
+  - action: run
+    description: "Setting up sysroot storage"
+    chroot: true
+    script: scripts/setup_sysroot.sh
+  {{ end }}
+
+  - action: run
+    description: "disable deprecated gnome-vfs-2.0 documentation"
+    chroot: true
+    script: scripts/disable-deprecated-gnome-vfs-2.0.sh
+
+  - action: run
+    chroot: true
+    script: scripts/add_user_to_groups.sh
+
+  - action: run
+    chroot: true
+    script: scripts/check_sudoers_for_admin.sh
+
+  - action: run
+    chroot: true
+    script: scripts/generate_openssh_keys.sh
+
+  - action: run
+    chroot: true
+    script: scripts/add-initramfs-modules.sh
+
+  - action: run
+    description: "Generate locales"
+    chroot: true
+    script: scripts/generate_locales.sh
+
+  - action: run
+    description: "Save installed package status"
+    chroot: false
+    command: gzip -c "${ROOTDIR}/var/lib/dpkg/status" > "${ARTIFACTDIR}/{{ $ospack }}.pkglist.gz"
+
+  - action: run
+    description: List files on {{ $ospack }}
+    chroot: false
+    script: scripts/list-files "$ROOTDIR" | gzip > "${ARTIFACTDIR}/{{ $ospack }}.filelist.gz"
+
+  - action: pack
+    compression: gz
+    file: {{ $ospack }}.tar.gz
diff --git a/apertis-ospack-target.yaml b/apertis-ospack-target.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4b1a79fbefa6fe93f1fd6436fab918d7a6e08e0f
--- /dev/null
+++ b/apertis-ospack-target.yaml
@@ -0,0 +1,262 @@
+{{- $architecture := or .architecture "amd64" }}
+{{- $type := or .type "minimal" -}}
+{{- $mirror := or .mirror "https://repositories.apertis.org/apertis/" -}}
+{{- $suite := or .suite "18.06" -}}
+{{- $timestamp := or .timestamp "00000000.0" -}}
+{{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s" $suite $architecture $type $timestamp) -}}
+{{- $ivitools := or .ivitools "enabled" -}}
+{{- $lxc := or .lxc "enabled" -}}
+
+architecture: {{ $architecture }}
+
+actions:
+  - action: debootstrap
+    suite: {{ $suite }}
+    components:
+      - target
+    mirror: {{ $mirror }}
+    variant: minbase
+    keyring-package: apertis-archive-keyring
+    keyring-file: keyring/apertis-archive-keyring.gpg
+    merged-usr: false
+
+  # Add image version information
+  - action: run
+    description: "Setting up image version metadata"
+    chroot: true
+    script: scripts/setup_image_version.sh apertis {{ $suite }} {{ $timestamp }} collabora
+
+  # Extend apt sources list
+  - action: run
+    chroot: true
+    script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} target
+
+  {{ if eq $ivitools "enabled" }}
+  - action: run
+    chroot: true
+    script: scripts/apt_source.sh -m {{ $mirror }} -r {{ $suite }} hmi helper-libs
+  {{ end }}
+
+  - action: apt
+    description: "Core packages"
+    packages:
+      - sudo
+      - apt-transport-https
+      - apertis-customizations
+      - initramfs-tools
+
+  - action: apt
+    description: "Base packages"
+    packages:
+      - busybox
+      - busybox-initramfs
+      - dbus-user-session
+
+  - action: apt
+    description: "Networking packages"
+    packages:
+      - connman
+      - wpasupplicant
+
+  - action: apt
+    description: "AppArmor packages"
+    packages:
+      - apparmor
+      - chaiwala-apparmor-profiles
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "Application framework packages"
+    packages:
+      - canterbury-core
+      - newport
+      - ribchester-core
+  {{ end }}
+
+  - action: apt
+    description: "Test environment packages"
+    packages:
+      - net-tools
+      - openssh-client
+      - openssh-server
+      - vim.tiny
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "HMI packages"
+    packages:
+      - eye
+      - frampton
+      - mildenhall
+      - mildenhall-compositor
+      - mildenhall-launcher
+      - mildenhall-popup-layer
+      - mildenhall-settings
+      - mildenhall-statusbar
+      - xwayland
+  {{ end }}
+
+  - action: apt
+    description: "Target user session packages"
+    packages:
+      - chaiwala-user-session-wayland
+
+  - action: apt
+    description: "Target packages"
+    packages:
+      - adduser
+      - apertis-archive-keyring
+      - apertis-customizations
+      - apparmor
+      - apparmor-profiles
+      - apt
+      - apt-transport-https
+      - apt-utils
+      - auditd
+      - avahi-daemon
+      - bluez
+      - bluez-obexd
+      - btrfs-tools
+      - busybox-initramfs
+      - bzip2
+      - ca-certificates
+      - chaiwala-apparmor-profiles
+      - connman
+      - debconf-i18n
+      - evolution-data-server
+      - file
+      - fonts-dejavu-extra
+      - gnupg
+      - gstreamer1.0-clutter-3.0
+      - gstreamer1.0-plugins-good
+      - gstreamer1.0-pulseaudio
+      - gvfs
+      - initramfs-tools
+      - iproute
+      - iptables
+      - kmod
+      - libgupnp-1.0-4
+      - liblockfile-bin
+      - libnss-myhostname
+      - libproxy1-pacrunner
+      - libwebkit2gtk-4.0-37
+      - linux-firmware
+      - locales
+      - lsb-base
+      - lzma
+      - mawk
+      - mobile-broadband-provider-info
+      - mutter
+      - net-tools
+      - netbase
+      - openssh-client
+      - openssh-server
+      - pacrunner
+      - plymouth
+      - plymouth-themes
+      - policykit-1
+      - pulseaudio
+      - pulseaudio-module-bluetooth
+      - pulseaudio-module-x11
+      - pulseaudio-utils
+      - sudo
+      - systemd-sysv
+      - tcmmd
+      - tracker
+      - tracker-miner-fs
+      - tumbler
+      - tumbler-plugins-extra
+      - udev
+      - usb-modeswitch
+      - vim-tiny
+      - whiptail
+      - wpasupplicant
+      - xauth
+      - xdg-user-dirs
+      - xwayland
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "Target packages (CM)"
+    packages:
+      - barkway
+      - beckfoot
+      - canterbury
+      - didcot
+      - dlt-daemon
+      - frome
+      - geoclue
+      - grilo-plugins-0.2
+      - newport
+      - ofono
+      - prestwood
+      - rhosydd
+      - ribchester
+      - shapwick
+      - syncevolution
+      - tinwell
+  {{ end }}
+
+  - action: overlay
+    source: overlays/arch-platform
+
+  - action: overlay
+    source: {{ printf "overlays/arch-%s" $type }}
+
+  - action: overlay
+    source: {{ printf "overlays/%s-platform" $architecture }}
+
+  - action: overlay
+    source: {{ printf "overlays/%s-%s" $architecture $type }}
+
+  - action: run
+    chroot: true
+    script: scripts/add-xdg-user-metadata.sh
+
+  - action: run
+    chroot: true
+    script: scripts/create-mtab-symlink.hook.sh
+
+  - action: run
+    chroot: true
+    script: scripts/setup_user.sh
+
+  - action: run
+    chroot: true
+    description: "Creating mount point /Applications"
+    command: install -d -m 0755 /Applications
+
+  - action: run
+    chroot: true
+    script: scripts/add_user_to_groups.sh
+
+  - action: run
+    chroot: true
+    script: scripts/check_sudoers_for_admin.sh
+
+  - action: run
+    chroot: true
+    script: scripts/generate_openssh_keys.sh
+
+  - action: run
+    chroot: true
+    script: scripts/add-initramfs-modules.sh
+
+  - action: run
+    description: "Generate locales"
+    chroot: true
+    script: scripts/generate_locales.sh
+
+  - action: run
+    description: "Save installed package status"
+    chroot: false
+    command: gzip -c "${ROOTDIR}/var/lib/dpkg/status" > "${ARTIFACTDIR}/{{ $ospack }}.pkglist.gz"
+
+  - action: run
+    description: List files on {{ $ospack }}
+    chroot: false
+    script: scripts/list-files "$ROOTDIR" | gzip > "${ARTIFACTDIR}/{{ $ospack }}.filelist.gz"
+
+  - action: pack
+    compression: gz
+    file: {{ $ospack }}.tar.gz