diff --git a/apertis-ospack-target.yaml b/apertis-ospack-target.yaml
index 8429e14b75c1740be6f3ec3d03c9976dea36c0ae..2222ffcb7cb9eb07b88e5af79b95ba959f488e87 100644
--- a/apertis-ospack-target.yaml
+++ b/apertis-ospack-target.yaml
@@ -4,8 +4,8 @@
 {{- $suite := or .suite "18.12" -}}
 {{- $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" -}}
+{{- $ivitools := or .ivitools "disabled" -}}
+{{- $lxc := or .lxc "disabled" -}}
 
 architecture: {{ $architecture }}
 
@@ -42,14 +42,13 @@ actions:
     packages:
       - sudo
       - apt-transport-https
-      - apertis-customizations
+      # - apertis-customizations
       - initramfs-tools
 
   - action: apt
     description: "Base packages"
     packages:
       - busybox
-      - busybox-initramfs
       - dbus-user-session
 
   - action: apt
@@ -62,7 +61,7 @@ actions:
     description: "AppArmor packages"
     packages:
       - apparmor
-      - chaiwala-apparmor-profiles
+      # - chaiwala-apparmor-profiles
 
   {{ if eq $ivitools "enabled" }}
   - action: apt
@@ -99,14 +98,14 @@ actions:
   - action: apt
     description: "Target user session packages"
     packages:
-      - chaiwala-user-session-wayland
+      #- chaiwala-user-session-wayland
 
   - action: apt
     description: "Target packages"
     packages:
       - adduser
       - apertis-archive-keyring
-      - apertis-customizations
+      #- apertis-customizations
       - apparmor
       - apparmor-profiles
       - apt
@@ -117,53 +116,52 @@ actions:
       - bluez
       - bluez-obexd
       - btrfs-tools
-      - busybox-initramfs
       - bzip2
       - ca-certificates
-      - chaiwala-apparmor-profiles
+      #- chaiwala-apparmor-profiles
       - connman
       - debconf-i18n
-      - evolution-data-server
+      #- evolution-data-server
       - file
       - fonts-dejavu-extra
       - gnupg
-      - gstreamer1.0-clutter-3.0
+      #- gstreamer1.0-clutter-3.0
       - gstreamer1.0-plugins-good
       - gstreamer1.0-pulseaudio
       - gvfs
       - initramfs-tools
-      - iproute
+      - iproute2
       - iptables
       - kmod
       - libgupnp-1.0-4
       - liblockfile-bin
       - libnss-myhostname
-      - libproxy1-pacrunner
+      #- libproxy1-pacrunner
       - libwebkit2gtk-4.0-37
-      - linux-firmware
+      #- linux-firmware
       - locales
       - lsb-base
       - lzma
       - mawk
       - mobile-broadband-provider-info
-      - mutter
+      #- mutter
       - net-tools
       - netbase
       - openssh-client
       - openssh-server
-      - pacrunner
+      #- pacrunner
       - plymouth
-      - plymouth-themes
+      #- plymouth-themes
       - policykit-1
       - pulseaudio
       - pulseaudio-module-bluetooth
-      - pulseaudio-module-x11
+      #- pulseaudio-module-x11
       - pulseaudio-utils
       - sudo
       - systemd-sysv
-      - tcmmd
+      #- tcmmd
       - tracker
-      - tracker-miner-fs
+      #- tracker-miner-fs
       - tumbler
       - tumbler-plugins-extra
       - udev