diff --git a/applications/dev_ui/dev_gui/CMakeLists.txt b/applications/dev_ui/dev_gui/CMakeLists.txt
index 34fa5defb..b6624d4de 100644
--- a/applications/dev_ui/dev_gui/CMakeLists.txt
+++ b/applications/dev_ui/dev_gui/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Developer GUI install
-find_program(YARN_EXECUTABLE "yarn" REQUIRED)
+find_program(YARN_EXECUTABLE "yarnpkg" "yarn" REQUIRED)
 
 if(APPLE)
   set(NPM_TARGET macos-x64)
@@ -27,7 +27,7 @@ add_custom_command(
   COMMAND cp -r ${ZAP_CURRENT_OUTPUT_DIR}/. .
   COMMAND ${YARN_EXECUTABLE} version --no-git-tag-version --new-version
           ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}
-  COMMAND ${YARN_EXECUTABLE} install --allow-same-version
+  COMMAND ${YARN_EXECUTABLE} install
   COMMAND ${YARN_EXECUTABLE} run build
   USES_TERMINAL)
 
diff --git a/helper.mk b/helper.mk
index 7eb3d4435..0d52b54ac 100755
--- a/helper.mk
+++ b/helper.mk
@@ -25,6 +25,7 @@ packages+=nlohmann-json3-dev
 # TODO: remove for offline build
 packages+=curl wget python3-pip
 packages+=time
+packages+=yarnpkg
 
 rust_url?=https://sh.rustup.rs
 RUST_VERSION?=1.65.0
@@ -36,7 +37,7 @@ exes+=${zpc_exe}
 zpc_cmake_options?=\
 	-DBUILD_AOXPC=OFF \
 	-DBUILD_CPCD=OFF \
-	-DBUILD_DEV_GUI=OFF \
+	-DBUILD_DEV_GUI=ON \
 	-DBUILD_EMD=OFF \
 	-DBUILD_EPC=OFF \
 	-DBUILD_GMS=OFF \