diff --git a/core/BUILD b/core/BUILD
index bd49753..f413b5d 100644
--- a/core/BUILD
+++ b/core/BUILD
@@ -2,8 +2,8 @@
     name = "initramfs",
     srcs = [
         "//core/cmd/init",
-        "//core/build/utils:mkfs.xfs",
         "//core/cmd/kube-controlplane",
+        "//third_party/xfsprogs:mkfs.xfs",
     ],
     outs = [
         "initramfs.cpio.lz4",
@@ -15,7 +15,7 @@
 nod /dev/null 0644 0 0 c 1 3
 file /init $(location //core/cmd/init) 0755 0 0
 dir /bin 0755 0 0
-file /bin/mkfs.xfs $(location //core/build/utils:mkfs.xfs) 0755 0 0
+file /bin/mkfs.xfs $(location //third_party/xfsprogs:mkfs.xfs) 0755 0 0
 file /bin/kube-controlplane $(location //core/cmd/kube-controlplane) 0755 0 0
 EOF
     """,
diff --git a/core/build/edk2/BUILD b/core/build/edk2/BUILD
deleted file mode 100644
index e69de29..0000000
--- a/core/build/edk2/BUILD
+++ /dev/null
diff --git a/core/build/edk2/BUILD.repo b/core/build/edk2/BUILD.repo
deleted file mode 100644
index 7911678..0000000
--- a/core/build/edk2/BUILD.repo
+++ /dev/null
@@ -1,22 +0,0 @@
-genrule(
-    name = "firmware",
-    srcs = glob(["**"]),
-    outs = [
-        "OVMF_CODE.fd",
-        "OVMF_VARS.fd",
-    ],
-    cmd = """
-    (
-        # The edk2 build does not like Bazel's default genrule environment.
-        set +u
-
-        cd external/edk2
-        . edksetup.sh
-        make -C BaseTools/Source/C
-        build -DTPM2_ENABLE -DSECURE_BOOT_ENABLE -t GCC5 -a X64 -b RELEASE -p $$PWD/OvmfPkg/OvmfPkgX64.dsc
-    ) > /dev/null
-
-    cp external/edk2/Build/OvmfX64/RELEASE_GCC5/FV/{OVMF_CODE.fd,OVMF_VARS.fd} $(RULEDIR)
-    """,
-    visibility = ["//visibility:public"],
-)
diff --git a/core/build/kubernetes/0001-avoid-unexpected-keyword-error-by-using-positional-p.patch b/core/build/kubernetes/0001-avoid-unexpected-keyword-error-by-using-positional-p.patch
deleted file mode 100644
index 5223bee..0000000
--- a/core/build/kubernetes/0001-avoid-unexpected-keyword-error-by-using-positional-p.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Copyright 2020 The Monogon Project Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-From d73ca1c4da53336442d2d256e70ce2acc45e4275 Mon Sep 17 00:00:00 2001
-From: Mostyn Bramley-Moore <mostynb@vewd.com>
-Date: Thu, 17 Oct 2019 14:00:18 +0200
-Subject: [PATCH] avoid unexpected keyword error by using positional parameters
-
-This avoids the following error, when building with bazel 1.0:
-...
-	File "/home/user/kubernetes/build/code_generation.bzl", line 44, in go_pkg
-		pkg.replace("staging/src/", "vendor/", maxsplit ...)
-unexpected keyword 'maxsplit', for call to method replace(old, new, maxsplit = None) of 'string'
-
-Fixes #81382
----
- build/code_generation.bzl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build/code_generation.bzl b/build/code_generation.bzl
-index eed223eb86..6feef4ba6e 100644
---- a/build/code_generation.bzl
-+++ b/build/code_generation.bzl
-@@ -41,7 +41,7 @@ def go_pkg(pkg):
-         ...
-     )
-     """
--    return go_prefix + "/" + pkg.replace("staging/src/", "vendor/", maxsplit = 1)
-+    return go_prefix + "/" + pkg.replace("staging/src/", "vendor/", 1)
- 
- def openapi_deps():
-     deps = [
--- 
-2.20.1
-
diff --git a/core/build/kubernetes/BUILD b/core/build/kubernetes/BUILD
deleted file mode 100644
index e69de29..0000000
--- a/core/build/kubernetes/BUILD
+++ /dev/null
diff --git a/core/build/utils/BUILD b/core/build/utils/BUILD
deleted file mode 100644
index 9a8dc68..0000000
--- a/core/build/utils/BUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# TODO(leo): I have not been able to figure out a clever way of separating this
-# into multiple rules, particularly musl, which hardcodes sandbox paths into its
-# toolchain such that a different rule cannot consume it.
-#
-# For now, using a single massive genrule is the least annoying way to do this.
-# As soon as we build more than just mkfs.xfs, we should re-visit this.
-#
-# Some possibilities:
-#
-#  - Build the musl toolchain in the build container and use native rules
-#    for headers_install and util_linux (they should, in theory, generate
-#    well-defined artifacts that we can use in the build).
-#
-#    This would use Bazel's toolchain definition mechanism to consume the
-#    external toolchain, and would be compatible with the native C rules.
-#
-#    Maybe we can even build the external toolchain inside Bazel somehow?
-#
-#  - Write a custom rule that handles the toolchain.
-#
-#  - Converting *everything* to native rules is probably not an option due
-#    to how complex the third party build systems we touch are.
-
-genrule(
-    name = "utils",
-    srcs = [
-        "@xfsprogs_dev//:all",
-        "@musl//:all",
-        "@util_linux//:all",
-        "@linux//:all",
-    ],
-    outs = [
-        "mkfs.xfs",
-    ],
-    cmd = """
-    MUSL=$$PWD/$(RULEDIR)/musl_prefix
-
-    echo "Compiling and installing musl..."
-    (
-        cd external/musl
-        ./configure --prefix=$$MUSL --syslibdir=$$MUSL/lib
-        make -j $$(nproc) install
-    ) > /dev/null
-
-    echo "Installing Linux kernel headers..."
-    (
-        cd external/linux
-        make headers_install ARCH=x86_64 INSTALL_HDR_PATH=$$MUSL
-    ) > /dev/null
-
-    echo "Compiling util_linux..."
-    (
-        cd external/util_linux
-        ./autogen.sh
-        ./configure \
-        CC="$$MUSL/bin/musl-gcc" \
-        --without-systemd \
-        --without-udev \
-        --without-btrfs \
-        --disable-pylibmount \
-        --without-tinfo \
-        --prefix=$$MUSL \
-        --disable-makeinstall-chown \
-        --disable-makeinstall-setuid \
-        --with-bashcompletiondir=$$MUSL/usr/share/bash-completion
-        make -j $$(nproc) libuuid.la libblkid.la
-        echo "Installing util_linux..."
-        cp -v .libs/* $$MUSL/lib/
-        mkdir -p $$MUSL/include/{uuid,blkid}
-        cp libuuid/src/uuid.h $$MUSL/include/uuid/
-        cp libblkid/src/blkid.h $$MUSL/include/blkid/
-    ) > /dev/null
-
-    echo "Compiling mkfs.xfs..."
-    (
-        cd external/xfsprogs_dev
-        make configure
-        ./configure CC="$$MUSL/bin/musl-gcc" CFLAGS="-static" --prefix=$$MUSL
-        echo COMPILERING
-        make mkfs -j8
-    ) > /dev/null
-
-    cp external/xfsprogs_dev/mkfs/mkfs.xfs $(RULEDIR)
-    """,
-    visibility = ["//visibility:public"],
-)
diff --git a/core/build/utils/xfsprogs_dev/0001-Fixes-for-static-compilation.patch b/core/build/utils/xfsprogs_dev/0001-Fixes-for-static-compilation.patch
deleted file mode 100644
index 14dd4cd..0000000
--- a/core/build/utils/xfsprogs_dev/0001-Fixes-for-static-compilation.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Copyright 2020 The Monogon Project Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-From 780a94ddc5c50bded264bfc0dbfffdb4182cdc51 Mon Sep 17 00:00:00 2001
-From: Lorenz Brun <lorenz@nexantic.com>
-Date: Mon, 9 Sep 2019 15:56:42 +0200
-Subject: [PATCH] Fixes for static compilation
-
----
- include/xfs.h | 6 +++---
- mkfs/Makefile | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/xfs.h b/include/xfs.h
-index f2f675df..73687a16 100644
---- a/include/xfs.h
-+++ b/include/xfs.h
-@@ -6,7 +6,7 @@
- #define __XFS_H__
- 
- #if defined(__linux__)
--#include <xfs/linux.h>
-+#include "linux.h"
- #else
- # error unknown platform... have fun porting!
- #endif
-@@ -34,7 +34,7 @@ extern int xfs_assert_largefile[sizeof(off_t)-8];
- #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
- #endif
- 
--#include <xfs/xfs_types.h>
--#include <xfs/xfs_fs.h>
-+#include "xfs_types.h"
-+#include "xfs_fs.h"
- 
- #endif	/* __XFS_H__ */
-diff --git a/mkfs/Makefile b/mkfs/Makefile
-index 31482b08..57fb355d 100644
---- a/mkfs/Makefile
-+++ b/mkfs/Makefile
-@@ -13,7 +13,7 @@ CFILES = proto.c xfs_mkfs.c
- LLDLIBS += $(LIBXFS) $(LIBXCMD) $(LIBFROG) $(LIBRT) $(LIBPTHREAD) $(LIBBLKID) \
- 	$(LIBUUID)
- LTDEPENDENCIES += $(LIBXFS) $(LIBXCMD) $(LIBFROG)
--LLDFLAGS = -static-libtool-libs
-+LLDFLAGS = -all-static
- 
- default: depend $(LTCOMMAND)
- 
--- 
-2.20.1
-
diff --git a/core/build/utils/xfsprogs_dev/BUILD b/core/build/utils/xfsprogs_dev/BUILD
deleted file mode 100644
index e69de29..0000000
--- a/core/build/utils/xfsprogs_dev/BUILD
+++ /dev/null
diff --git a/core/scripts/BUILD b/core/scripts/BUILD
index 8e8f18a..28d3aae 100644
--- a/core/scripts/BUILD
+++ b/core/scripts/BUILD
@@ -3,7 +3,7 @@
     data = [
         "//core:image",
         "//core:swtpm_data",
-        "@edk2//:firmware",
+        "//third_party/edk2:firmware",
     ],
 )
 
@@ -17,7 +17,7 @@
     name = "test_deps",
     data = [
         ":launch",
-        "//:kubectl",
+        "//third_party/kubernetes:kubectl",
     ],
 )