diff --git a/Makefile b/Makefile
index 5af3904..7079ef6 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,6 @@
 
 include $(ROOTDIR)/build/boot.mk
 include $(ROOTDIR)/build/debootstrap.mk
-include $(ROOTDIR)/build/gpu.mk
 include $(ROOTDIR)/build/vpu.mk
 include $(ROOTDIR)/build/img2simg.mk
 include $(ROOTDIR)/build/kernel.mk
diff --git a/gpu.mk b/gpu.mk
deleted file mode 100644
index b79d230..0000000
--- a/gpu.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-ifeq ($(ROOTDIR),)
-$(error $$ROOTDIR IS NOT DEFINED -- don\'t forget to source setup.sh)
-endif
-
-include $(ROOTDIR)/build/preamble.mk
-
-LIBDRM_DIR := $(PRODUCT_OUT)/obj/LIBDRM
-LIBDRM_DEBS := libdrm2_2.4.84+imx-0_arm64.deb libdrm-vivante_2.4.84+imx-0_arm64.deb
-LIBDRM_DEBS_DEV := libdrm-dev_2.4.84+imx-0_arm64.deb
-LIBDRM_TARGETS := $(addprefix $(PRODUCT_OUT)/, $(LIBDRM_DEBS)) $(addprefix $(PRODUCT_OUT)/dev/, $(LIBDRM_DEBS_DEV))
-
-libdrm-imx: $(LIBDRM_TARGETS)
-gpu-packages: libdrm-imx
-
-$(LIBDRM_TARGETS): $(ROOTDIR)/cache/arm64-builder.tar
-	mkdir -p $(PRODUCT_OUT)/dev
-	mkdir -p $(LIBDRM_DIR)/libdrm-2.4.84+imx
-	rsync -r $(ROOTDIR)/libdrm-imx/ $(LIBDRM_DIR)/libdrm-2.4.84+imx
-	tar -C $(LIBDRM_DIR) -cJf $(LIBDRM_DIR)/libdrm_2.4.84+imx.orig.tar.xz libdrm-2.4.84+imx
-	rsync -r $(ROOTDIR)/packages/libdrm-imx/debian/ $(LIBDRM_DIR)/libdrm-2.4.84+imx/debian/
-	docker load -i $(ROOTDIR)/cache/arm64-builder.tar
-	docker run --rm --privileged --tty \
-	  -v $(PRODUCT_OUT):/out \
-	  -v $(LIBDRM_DIR):/libdrm arm64-builder \
-	  /bin/bash -c 'cd /libdrm/libdrm-2.4.84+imx; \
-	  dpkg-buildpackage -uc -us -tc;'
-	cp $(LIBDRM_DIR)/libdrm2_2.4.84+imx-0_arm64.deb $(PRODUCT_OUT)
-	cp $(LIBDRM_DIR)/libdrm-vivante_2.4.84+imx-0_arm64.deb $(PRODUCT_OUT)
-	cp $(LIBDRM_DIR)/libdrm-dev_2.4.84+imx-0_arm64.deb $(PRODUCT_OUT)/dev
-
-.PHONY:: gpu-packages
diff --git a/gst.mk b/gst.mk
index ba32112..156a545 100644
--- a/gst.mk
+++ b/gst.mk
@@ -135,7 +135,7 @@
 	cp $(addprefix $(GST_DIR)/,$(GST_P_GOOD_DEBS)) $(PRODUCT_OUT)
 	cp $(addprefix $(GST_DIR)/,$(GST_P_GOOD_DEBS_AUX)) $(PRODUCT_OUT)/aux
 
-$(GST_P_BAD_TARGETS): $(LIBDRM_TARGETS) $(GST_P_BASE_TARGETS) $(KERNEL_DEB) wayland-protocols-imx $(ROOTDIR)/cache/arm64-builder.tar
+$(GST_P_BAD_TARGETS): libdrm-imx $(GST_P_BASE_TARGETS) $(KERNEL_DEB) wayland-protocols-imx $(ROOTDIR)/cache/arm64-builder.tar
 ifeq ($(call stat_files,$(addprefix $(GST_DIR)/,$(GST_P_BAD_DEBS) $(GST_P_BAD_DEBS_DEV) $(GST_P_BAD_DEBS_AUX))),0)
 	$(info $@ already built, not rebuilding)
 else
@@ -154,7 +154,7 @@
 	  /bin/bash -c '\
 		dpkg -i /out/wayland-protocols-imx_1.13-0_all.deb; \
 		dpkg -i /out/libdrm2_2.4.84+imx-0_arm64.deb /out/libdrm-vivante_2.4.84+imx-0_arm64.deb; \
-		dpkg -i /out/dev/libdrm-dev_2.4.84+imx-0_arm64.deb; \
+		dpkg -i /out/libdrm-dev_2.4.84+imx-0_arm64.deb; \
 		dpkg -i /out/linux-headers-4.9.51-aiy_1_arm64.deb; \
 		dpkg -i /out/libgstreamer1.0-0_1.12.2+imx-0_arm64.deb; \
 		dpkg -i /out/aux/gir1.2-gstreamer-1.0_1.12.2+imx-0_arm64.deb; \
@@ -174,7 +174,7 @@
 	cp $(addprefix $(GST_DIR)/,$(GST_P_BAD_DEBS_DEV)) $(PRODUCT_OUT)/dev
 	cp $(addprefix $(GST_DIR)/,$(GST_P_BAD_DEBS_AUX)) $(PRODUCT_OUT)/aux
 
-$(GST_P_IMX_TARGETS): $(LIBDRM_TARGETS) $(WRAP_TARGETS) $(HANTRO_TARGETS) $(GST_P_BASE_TARGETS) $(GST_P_BAD_TARGETS) $(KERNEL_DEB) $(ROOTDIR)/cache/arm64-builder.tar
+$(GST_P_IMX_TARGETS): libdrm-imx $(WRAP_TARGETS) $(HANTRO_TARGETS) $(GST_P_BASE_TARGETS) $(GST_P_BAD_TARGETS) $(KERNEL_DEB) $(ROOTDIR)/cache/arm64-builder.tar
 ifeq ($(call stat_files,$(addprefix $(GST_DIR)/,$(GST_P_IMX_DEBS))),0)
 	$(info $@ already built, not rebuilding)
 else
@@ -191,7 +191,7 @@
 	  -v $(GST_DIR):/gst arm64-builder \
 	  /bin/bash -c '\
 		dpkg -i /out/libdrm2_2.4.84+imx-0_arm64.deb /out/libdrm-vivante_2.4.84+imx-0_arm64.deb; \
-		dpkg -i /out/dev/libdrm-dev_2.4.84+imx-0_arm64.deb; \
+		dpkg -i /out/libdrm-dev_2.4.84+imx-0_arm64.deb; \
 		dpkg -i /out/imx-vpu-hantro_1.6.0-0_arm64.deb out/dev/imx-vpu-hantro-dev_1.6.0-0_arm64.deb; \
 		dpkg -i /out/imx-vpuwrap_4.3.4-0_arm64.deb out/dev/imx-vpuwrap-dev_4.3.4-0_arm64.deb; \
 		dpkg -i /out/linux-headers-4.9.51-aiy_1_arm64.deb; \
diff --git a/packages.mk b/packages.mk
index 386e5e1..8fcb9a6 100644
--- a/packages.mk
+++ b/packages.mk
@@ -82,6 +82,7 @@
 $(eval $(call make-pbuilder-package-target,weston-imx,weston-imx,wayland-protocols-imx))
 
 $(eval $(call make-pbuilder-package-target,imx-gpu-viv,packages/imx-gpu-viv))
+$(eval $(call make-pbuilder-package-target,libdrm-imx,libdrm-imx))
 
 $(eval $(call make-pbuilder-package-target,aiy-board-audio,packages/aiy-board-audio))
 $(eval $(call make-pbuilder-package-target,aiy-board-gadget,packages/aiy-board-gadget))
diff --git a/rootfs.mk b/rootfs.mk
index e849657..5501a7b 100644
--- a/rootfs.mk
+++ b/rootfs.mk
@@ -140,4 +140,4 @@
 targets::
 	@echo "rootfs - runs debootstrap to build the rootfs tree"
 
-.PHONY:: rootfs rootfs_raw gpu firmware adjustments fetch_debs push_debs
+.PHONY:: rootfs rootfs_raw firmware adjustments fetch_debs push_debs
diff --git a/signing.mk b/signing.mk
index 9d258fd..0d68ce5 100644
--- a/signing.mk
+++ b/signing.mk
@@ -5,7 +5,7 @@
 include $(ROOTDIR)/build/preamble.mk
 
 make-repo: $(PRODUCT_OUT)/repo/debian_repo/dists/stable/Release
-$(PRODUCT_OUT)/repo/debian_repo/dists/stable/Release: $(ROOTDIR)/build/distributions | kernel-deb modules packages gpu-packages
+$(PRODUCT_OUT)/repo/debian_repo/dists/stable/Release: $(ROOTDIR)/build/distributions | kernel-deb modules packages
 	mkdir -p $(PRODUCT_OUT)/repo
 	mkdir -p $(PRODUCT_OUT)/repo/debian_repo
 	mkdir -p $(PRODUCT_OUT)/repo/deb_repo_config