diff --git a/.gitignore b/.gitignore
index 06a8fb9e8..929180b40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,11 @@
 test.log
 *.swp
 /hyperkit.bin
-/disk.img
+*.img
+*.tag
+*.iso
+*.vhd
+*.tar
+*.tar.gz
+*.vhdx
+*.efi
diff --git a/alpine/.gitignore b/alpine/.gitignore
index 75aa11237..fdc7c4ef5 100644
--- a/alpine/.gitignore
+++ b/alpine/.gitignore
@@ -1,9 +1 @@
-*.img
-*.tag
-*.iso
-*.vhd
-*.tar
-*.tar.gz
-/mobylinux-boot.vhdx
-/mobylinux.efi
 etc/moby-commit
diff --git a/alpine/Makefile b/alpine/Makefile
index f35f1a42f..f04011ed9 100644
--- a/alpine/Makefile
+++ b/alpine/Makefile
@@ -1,4 +1,4 @@
-all:	initrd.img initrd-test.img mobylinux-efi.iso mobylinux-bios.iso ebpf
+all:	initrd.img initrd-test.img mobylinux-efi.iso mobylinux-bios.iso
 
 ETCFILES=$(shell find etc)
 
@@ -77,10 +77,6 @@ initrd.img: moby.img kernel/x86_64/kernel.img container.img
 initrd-test.img: initrd.img test.img
 	cat $^ > $@
 
-.PHONY: epbf
-ebpf: kernel/x86_64/kernel.img
-	$(MAKE) -C ebpf
-
 # outputs tarball of mobylinux-efi.iso mobylinux.efi
 mobylinux-efi.iso: initrd.img kernel/x86_64/vmlinuz64
 	tar cf - $^ | docker run --rm --net=none --log-driver=none -i $(EFI_IMAGE) | tar xf -
@@ -217,6 +213,5 @@ clean:
 	$(MAKE) -C containers clean
 	$(MAKE) -C test clean
 	$(MAKE) -C kernel clean
-	$(MAKE) -C ebpf clean
 
 .DELETE_ON_ERROR:
diff --git a/alpine/ebpf/Dockerfile b/ebpf/Dockerfile
similarity index 100%
rename from alpine/ebpf/Dockerfile
rename to ebpf/Dockerfile
diff --git a/alpine/ebpf/Makefile b/ebpf/Makefile
similarity index 69%
rename from alpine/ebpf/Makefile
rename to ebpf/Makefile
index 9036e7ca9..850e21d6f 100644
--- a/alpine/ebpf/Makefile
+++ b/ebpf/Makefile
@@ -1,4 +1,4 @@
-KERNEL_FILES=-C ../kernel/x86_64 kernel-headers.tar kernel-dev.tar kernel-modules.tar
+KERNEL_FILES=-C ../alpine/kernel/x86_64 kernel-headers.tar kernel-dev.tar kernel-modules.tar
 
 default: ebpf.tag