diff --git a/ci/u-boot-qcom.yml b/ci/u-boot-qcom.yml
index bcdd1f7d8..c4f7a3d9e 100644
--- a/ci/u-boot-qcom.yml
+++ b/ci/u-boot-qcom.yml
@@ -4,3 +4,6 @@ header:
 local_conf_header:
   bootloaderprovider: |
     PREFERRED_PROVIDER_virtual/bootloader = "u-boot-qcom"
+  libubootenv: |
+    IMAGE_INSTALL:append = " u-boot-fw-utils u-boot-qcom-env"
+
diff --git a/conf/machine/include/qcom-u-boot-common.inc b/conf/machine/include/qcom-u-boot-common.inc
index ea400e957..2471d0907 100644
--- a/conf/machine/include/qcom-u-boot-common.inc
+++ b/conf/machine/include/qcom-u-boot-common.inc
@@ -6,7 +6,7 @@
 UBOOT_CONFIG ?= ""
 UBOOT_CONFIG_DEFAULT ?= "${UBOOT_CONFIG}"
 
-UBOOT_INITIAL_ENV = ""
+UBOOT_INITIAL_ENV = "u-boot-initial-env"
 
 # Don't forget to add config to qcom-armv8a.conf when adding it here
 UBOOT_CONFIG[iq-615-evk] = "qcom_qcs615_defconfig"
diff --git a/recipes-bsp/u-boot/files/fw_env.config b/recipes-bsp/u-boot/files/fw_env.config
new file mode 100644
index 000000000..bfb06d8e0
--- /dev/null
+++ b/recipes-bsp/u-boot/files/fw_env.config
@@ -0,0 +1,4 @@
+# Configuration file for fw_(printenv/setenv) utility (libubootenv).
+# Device path             Offset   Size
+/dev/disk/by-partlabel/logfs   -0x4000   0x4000
+
diff --git a/recipes-bsp/u-boot/u-boot-qcom_git.bb b/recipes-bsp/u-boot/u-boot-qcom_git.bb
index 79955a767..a195279e1 100644
--- a/recipes-bsp/u-boot/u-boot-qcom_git.bb
+++ b/recipes-bsp/u-boot/u-boot-qcom_git.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/qualcomm-linux/u-boot.git;${SRCBRANCH};protocol=http
 SRC_URI += " \
     file://disable-eficapsule-tool.cfg \
     file://efi-rt-volatile-store.cfg \
+    file://fw_env.config \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'file://tfa-optee.cfg', '', d)} \
     ${@bb.utils.contains('MACHINE_FEATURES', 'kvm', 'file://gunyah-exit.cfg', '', d)} \
 "