diff --git a/packages.mk b/packages.mk
index e3d9541..f062a19 100644
--- a/packages.mk
+++ b/packages.mk
@@ -13,19 +13,17 @@
 # limitations under the License.
 
 $(eval $(call make-pbuilder-bsp-package-target,linux-mtk,linux,u-boot))
-$(eval $(call make-pbuilder-bsp-package-target,lk-bootloader,bootloader/mtk-lk))
-$(eval $(call make-pbuilder-bsp-package-target,excelsior-wlan,connectivity/mt7668-wifi-mod, linux-mtk,,binary))
-$(eval $(call make-pbuilder-bsp-package-target,excelsior-bluetooth,connectivity/mt7668-bluetooth-mod, linux-mtk,,binary))
-$(eval $(call make-pbuilder-bsp-package-target,excelsior-connectivity-fw,connectivity/mt7668-fw))
+$(eval $(call make-pbuilder-bsp-package-target,lk-bootloader,bootloader/mtk-lk,,,binary))
+$(eval $(call make-pbuilder-bsp-package-target,excelsior-wlan,connectivity/mt7668-wifi-mod,linux-mtk))
+$(eval $(call make-pbuilder-bsp-package-target,excelsior-bluetooth,connectivity/mt7668-bluetooth-mod,linux-mtk))
+$(eval $(call make-pbuilder-bsp-package-target,excelsior-connectivity-fw,connectivity/mt7668-fw,,,binary))
 $(eval $(call make-pbuilder-bsp-package-target,mtk-board-audio,packages/mtk-board-audio))
 $(eval $(call make-pbuilder-bsp-package-target,meta-excelsior,packages/meta-excelsior))
-$(eval $(call make-pbuilder-bsp-package-target,excelsior-img-fw,graphics/img-fw))
+$(eval $(call make-pbuilder-bsp-package-target,excelsior-img-fw,graphics/img-fw,,,binary))
 $(eval $(call make-pbuilder-bsp-package-target,weston-mtk,graphics/wayland/weston))
-# $(eval $(call make-pbuilder-bsp-package-target,mesa-mtk,graphics/mesa))
-$(eval $(call make-pbuilder-bsp-package-target,glmark2,graphics/glmark2,weston-mtk))
-$(eval $(call make-pbuilder-bsp-package-target,excelsior-vpu-prebuilts,multimedia/vpu,mtk-gst-plugins-good mdpd))
-$(eval $(call make-pbuilder-bsp-package-target,libmdp-prot,multimedia/libmdp_prot))
-$(eval $(call make-pbuilder-bsp-package-target,mdpd,multimedia/mdpd, libmdp-prot))
+$(eval $(call make-pbuilder-bsp-package-target,excelsior-vpu-prebuilts,multimedia/vpu,mtk-gst-plugins-good mdpd,,binary))
+$(eval $(call make-pbuilder-bsp-package-target,libmdp-prot,multimedia/libmdp_prot,,,binary))
+$(eval $(call make-pbuilder-bsp-package-target,mdpd,multimedia/mdpd, libmdp-prot,,binary))
 $(eval $(call make-pbuilder-bsp-package-target,mtk-gstreamer,multimedia/mtk-gstreamer))
 $(eval $(call make-pbuilder-bsp-package-target,mtk-gst-plugins-base,multimedia/mtk-gst-plugins-base,mtk-gstreamer,,,$(USERSPACE_ARCH)))
 $(eval $(call make-pbuilder-bsp-package-target,mtk-gst-plugins-good,multimedia/mtk-gst-plugins-good,mtk-gst-plugins-base))
@@ -34,5 +32,5 @@
 $(eval $(call make-pbuilder-bsp-package-target,optee-os,bootloader/optee-os))
 $(eval $(call make-pbuilder-bsp-package-target,tf-a,bootloader/tf-a))
 $(eval $(call make-pbuilder-bsp-package-target,excelsior-bootloader,packages/excelsior-bootloader,u-boot optee-os tf-a))
-$(eval $(call make-pbuilder-bsp-package-target,a71ch-crypto-support,a71ch-crypto-support,,,binary,$(USERSPACE_ARCH)))
+$(eval $(call make-pbuilder-bsp-package-target,a71ch-crypto-support,a71ch-crypto-support,,,,$(USERSPACE_ARCH)))
 $(eval $(call make-pbuilder-bsp-package-target,excelsior-tools,packages/excelsior-tools))