diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index 6e20355d8..072beb818 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -80,6 +80,9 @@ BOOTSCHEME_DEFAULT ?= "opteemin"
 MACHINE_FEATURES += "bluetooth"
 MACHINE_FEATURES += "wifi"
 MACHINE_FEATURES += "gpu"
+# When BOOTSCHEME_LABELS is set to "opteemin", optee doesn't get automatically
+# added to MACHINE_FEATURES. Add it manually
+MACHINE_FEATURES += "optee"
 
 # =========================================================================
 # Firmware