diff --git a/examples/lighting-app/qpg/BUILD.gn b/examples/lighting-app/qpg/BUILD.gn
index 529c3c19fea878..361021fc21dcdc 100644
--- a/examples/lighting-app/qpg/BUILD.gn
+++ b/examples/lighting-app/qpg/BUILD.gn
@@ -64,8 +64,6 @@ qpg_executable("lighting_app") {
   ]
 
   deps = [
-    "${chip_root}/third_party/qpg_sdk:qpg_light_factorydata_lib",
-    "${chip_root}/third_party/qpg_sdk:qpg_light_firmwaredata_lib",
     ":sdk",
     "${chip_root}/examples/lighting-app/lighting-common:color-format",
     "${chip_root}/examples/lighting-app/qpg/zap/",
@@ -75,6 +73,8 @@ qpg_executable("lighting_app") {
     "${chip_root}/third_party/openthread/platforms:libopenthread-platform",
     "${chip_root}/third_party/openthread/platforms:libopenthread-platform-utils",
     "${chip_root}/third_party/qpg_sdk:qpg_light_factorydata_lib",
+    "${chip_root}/third_party/qpg_sdk:qpg_light_factorydata_lib",
+    "${chip_root}/third_party/qpg_sdk:qpg_light_firmwaredata_lib",
   ]
 
   if (chip_openthread_ftd) {
diff --git a/examples/lock-app/qpg/BUILD.gn b/examples/lock-app/qpg/BUILD.gn
index 4a2ada73c6a00e..c8edc51a72545a 100644
--- a/examples/lock-app/qpg/BUILD.gn
+++ b/examples/lock-app/qpg/BUILD.gn
@@ -62,8 +62,6 @@ qpg_executable("lock_app") {
   ]
 
   deps = [
-    "${chip_root}/third_party/qpg_sdk:qpg_lock_factorydata_lib",
-    "${chip_root}/third_party/qpg_sdk:qpg_lock_firmwaredata_lib",
     ":sdk",
     "${chip_root}/examples/lock-app/qpg/zap/",
     "${chip_root}/examples/providers:device_info_provider",
@@ -72,6 +70,8 @@ qpg_executable("lock_app") {
     "${chip_root}/third_party/openthread/platforms:libopenthread-platform",
     "${chip_root}/third_party/openthread/platforms:libopenthread-platform-utils",
     "${chip_root}/third_party/qpg_sdk:qpg_lock_factorydata_lib",
+    "${chip_root}/third_party/qpg_sdk:qpg_lock_factorydata_lib",
+    "${chip_root}/third_party/qpg_sdk:qpg_lock_firmwaredata_lib",
   ]
 
   if (chip_openthread_ftd) {
diff --git a/third_party/qpg_sdk/BUILD.gn b/third_party/qpg_sdk/BUILD.gn
index d4ab432f16ca3c..671804cfa586d3 100755
--- a/third_party/qpg_sdk/BUILD.gn
+++ b/third_party/qpg_sdk/BUILD.gn
@@ -191,7 +191,8 @@ qpg_make_build("qpg_light_factorydata") {
   make_output = [ "${target_gen_dir}/${qpg_sdk_lib_dir}/FactoryData_light_static_pake/libFactoryData_light_static_pake.a" ]
   make_args = [
     "-f",
-    rebase_path(qpg_sdk_root, root_build_dir) + "/Libraries/Qorvo/FactoryData/Makefile.FactoryData_light_static_pake",
+    rebase_path(qpg_sdk_root, root_build_dir) +
+        "/Libraries/Qorvo/FactoryData/Makefile.FactoryData_light_static_pake",
     "WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) +
         "/${qpg_sdk_lib_dir}/FactoryData_light_static_pake",
   ]
@@ -207,7 +208,8 @@ qpg_make_build("qpg_lock_factorydata") {
   make_output = [ "${target_gen_dir}/${qpg_sdk_lib_dir}/FactoryData_lock_static_pake/libFactoryData_lock_static_pake.a" ]
   make_args = [
     "-f",
-    rebase_path(qpg_sdk_root, root_build_dir) + "/Libraries/Qorvo/FactoryData/Makefile.FactoryData_lock_static_pake",
+    rebase_path(qpg_sdk_root, root_build_dir) +
+        "/Libraries/Qorvo/FactoryData/Makefile.FactoryData_lock_static_pake",
     "WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) +
         "/${qpg_sdk_lib_dir}/FactoryData_lock_static_pake",
   ]
@@ -230,7 +232,8 @@ qpg_make_build("qpg_light_firmwaredata") {
   make_output = [ "${target_gen_dir}/${qpg_sdk_lib_dir}/FirmwareData_light/libFirmwareData_light.a" ]
   make_args = [
     "-f",
-    rebase_path(qpg_sdk_root, root_build_dir) + "/Libraries/Qorvo/FactoryData/Makefile.FirmwareData_light",
+    rebase_path(qpg_sdk_root, root_build_dir) +
+        "/Libraries/Qorvo/FactoryData/Makefile.FirmwareData_light",
     "WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) +
         "/${qpg_sdk_lib_dir}/FirmwareData_light",
   ]
@@ -245,7 +248,8 @@ qpg_make_build("qpg_lock_firmwaredata") {
   make_output = [ "${target_gen_dir}/${qpg_sdk_lib_dir}/FirmwareData_lock/libFirmwareData_lock.a" ]
   make_args = [
     "-f",
-    rebase_path(qpg_sdk_root, root_build_dir) + "/Libraries/Qorvo/FactoryData/Makefile.FirmwareData_lock",
+    rebase_path(qpg_sdk_root, root_build_dir) +
+        "/Libraries/Qorvo/FactoryData/Makefile.FirmwareData_lock",
     "WORKDIR=" + rebase_path(target_gen_dir, root_build_dir) +
         "/${qpg_sdk_lib_dir}/FirmwareData_lock",
   ]