diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml
index cc8d2d37629ad2f240ecf2653694a361886801c1..02c7cf2df9678cd19b7db493073e7ed71183c8c5 100644
--- a/apertis-ospack-sdk.yaml
+++ b/apertis-ospack-sdk.yaml
@@ -4,7 +4,6 @@
 {{- $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" -}}
 
 architecture: {{ $architecture }}
@@ -31,11 +30,9 @@ actions:
     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
@@ -77,14 +74,12 @@ actions:
       - 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"
@@ -94,7 +89,6 @@ actions:
       - openssh-server
       - vim.tiny
 
-  {{ if eq $ivitools "enabled" }}
   - action: apt
     description: "HMI packages"
     packages:
@@ -107,7 +101,6 @@ actions:
       - mildenhall-settings
       - mildenhall-statusbar
       - xwayland
-  {{ end }}
 
   - action: apt
     description: "Target packages"
@@ -183,7 +176,6 @@ actions:
       - xdg-user-dirs
       - xwayland
 
-  {{ if eq $ivitools "enabled" }}
   - action: apt
     description: "Target packages (CM)"
     packages:
@@ -203,7 +195,6 @@ actions:
       - shapwick
       - syncevolution
       - tinwell
-  {{ end }}
 
   {{ if eq $lxc "enabled" }}
   - action: apt
@@ -225,12 +216,10 @@ actions:
     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"
@@ -334,7 +323,6 @@ actions:
       - wget
       - xinput
 
-  {{ if eq $ivitools "enabled" }}
   - action: apt
     description: "Development packages (CM)"
     packages:
@@ -370,7 +358,6 @@ actions:
       - ribchester-dev
       - shapwick-dev
       - tinwell-dev
-  {{ end }}
 
   - action: apt
     description: "SDK packages"
@@ -610,7 +597,6 @@ actions:
       - yelp
       - yelp-tools
 
-  {{ if eq $ivitools "enabled" }}
   - action: apt
     description: "SDK packages (CM)"
     packages:
@@ -679,7 +665,6 @@ actions:
       - tinwell-dev
       - tinwell-doc
       - traprain-mock-service
-  {{ end }}
 
   - action: overlay
     source: overlays/arch-platform
@@ -715,12 +700,10 @@ actions:
     description: "Creating mount point /Applications"
     command: install -d -m 0755 /Applications
 
-  {{ if eq $ivitools "enabled" }}
   - action: run
     description: "Setting up sysroot storage"
     chroot: true
     command: install -d -m 0755 -o user -g user /home/sysroot
-  {{ end }}
 
   - action: run
     description: "disable deprecated gnome-vfs-2.0 documentation"