diff --git a/conf/machine/iot-gate-imx8.conf b/conf/machine/iot-gate-imx8.conf
index 955939c..eb02457 100644
--- a/conf/machine/iot-gate-imx8.conf
+++ b/conf/machine/iot-gate-imx8.conf
@@ -25,3 +25,6 @@ UBOOT_DTB_NAME = "iot-gate-imx8.dtb"
 # Prefered components
 PREFERRED_PROVIDER_virtual/kernel_mx8mm = "linux-compulab"
 PREFERRED_PROVIDER_virtual/bootloader_mx8mm = "u-boot-compulab"
+
+# Block recipes
+BBMASK += "meta-compulab/recipes-bsp/u-boot"
diff --git a/templates/bblayers.conf/bblayers.extra.conf.append b/templates/bblayers.conf/bblayers.extra.conf.append
index 246a81f..a8bfd84 100644
--- a/templates/bblayers.conf/bblayers.extra.conf.append
+++ b/templates/bblayers.conf/bblayers.extra.conf.append
@@ -6,4 +6,5 @@ BBLAYERS += " \
 	${BSPDIR}/sources/meta-compulab-bsp/meta-bsp \
 	${BSPDIR}/sources/meta-compulab-bsp/meta-devtool \
 	${BSPDIR}/sources/meta-compulab-bsp/meta-net \
+	${BSPDIR}/sources/meta-compulab-bsp/meta-utils \
 "
diff --git a/templates/local.conf/chromium.append b/templates/local.conf/chromium.append
index 021b556..09f03f2 100644
--- a/templates/local.conf/chromium.append
+++ b/templates/local.conf/chromium.append
@@ -1,3 +1,4 @@
+#;DISABLE Chromium
 #;prompt Add Chromium browser [yes]
 
 # Add Chromium
diff --git a/templates/local.conf/local.conf.append b/templates/local.conf/local.conf.append
index de67f81..b8473ba 100644
--- a/templates/local.conf/local.conf.append
+++ b/templates/local.conf/local.conf.append
@@ -1,11 +1,17 @@
 LICENSE_FLAGS_WHITELIST = "commercial"
 CORE_IMAGE_EXTRA_INSTALL += " cl-uboot cl-deploy cl-stest cl-camera cl-audio "
-CORE_IMAGE_EXTRA_INSTALL += " u-boot-fw-utils "
 CORE_IMAGE_EXTRA_INSTALL += " memtester htop iotop tmux iperf3 "
 CORE_IMAGE_EXTRA_INSTALL += " wvdial "
-
+CORE_IMAGE_EXTRA_INSTALL += " libubootenv-bin u-boot-compulab-env "
 CORE_IMAGE_EXTRA_INSTALL += " u-boot-update-script "
+
+CORE_IMAGE_EXTRA_INSTALL_append_iot-gate-imx8 = " u-boot-script linux-firmware-ax200"
+CORE_IMAGE_EXTRA_INSTALL_append_iot-gate-imx8 += " networkmanager networkmanager-nmcli wireless-tools "
+CORE_IMAGE_EXTRA_INSTALL_append_iot-gate-imx8 += " libgpiod-tools eeprom-util bluez5 gpsd modemmanager "
+CORE_IMAGE_EXTRA_INSTALL_append_iot-gate-imx8 += " gps-utils can-utils minicom ntp ntpdate "
+EXTRA_IMAGE_FEATURES_append_iot-gate-imx8 = " ssh-server-openssh "
 IMAGE_BOOT_FILES_append = " boot.update.scr "
 
 HOSTTOOLS += " git-lfs"
 PREFERRED_RPROVIDER_u-boot-fw-utils = "u-boot-fw-utils"
+CL_DEPLOY_MOD = "1"
diff --git a/templates/local.conf/optee.append b/templates/local.conf/optee.append
index 579b6f3..db3d31c 100644
--- a/templates/local.conf/optee.append
+++ b/templates/local.conf/optee.append
@@ -1,2 +1,2 @@
-#;prompt Enable Trusted Execution Environment optee OS [no]
+#; Enable Trusted Execution Environment optee OS [no]
 MACHINE_FEATURES_append += " optee "
diff --git a/templates/local.conf/ro_rootfs.append b/templates/local.conf/ro_rootfs.append
index ffd12c6..0b50372 100644
--- a/templates/local.conf/ro_rootfs.append
+++ b/templates/local.conf/ro_rootfs.append
@@ -1,3 +1,3 @@
-#;prompt Read only root FS [no]
+#;DISABLE prompt Read only root FS [no]
 
-IMAGE_FEATURES += " read-only-rootfs "
\ No newline at end of file
+IMAGE_FEATURES += " read-only-rootfs "
diff --git a/templates/local.conf/rt_kernel.append b/templates/local.conf/rt_kernel.append
index 668a83b..dc2fdec 100644
--- a/templates/local.conf/rt_kernel.append
+++ b/templates/local.conf/rt_kernel.append
@@ -1,3 +1,3 @@
-#;prompt Realtime kernel support [no]
+#;DISABLE prompt Realtime kernel support [no]
 
 IMAGE_FEATURES += " realtime-kernel "