diff --git a/build/fietsje/BUILD.bazel b/build/fietsje/BUILD.bazel
index cf75cca..6e59787 100644
--- a/build/fietsje/BUILD.bazel
+++ b/build/fietsje/BUILD.bazel
@@ -4,7 +4,6 @@
     name = "go_default_library",
     srcs = [
         "dependency.go",
-        "deps_cilium.go",
         "deps_containerd.go",
         "deps_delve.go",
         "deps_gvisor.go",
diff --git a/build/fietsje/deps_cilium.go b/build/fietsje/deps_cilium.go
deleted file mode 100644
index 0a1252b..0000000
--- a/build/fietsje/deps_cilium.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2020 The Monogon Project Authors.
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-// 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.
-
-package main
-
-func depsCilium(p *planner) {
-	p.collect(
-		"github.com/cilium/cilium", "v1.8.0-rc1",
-		disabledProtoBuild,
-	).replace(
-		// Cilium forks this library to introduce an API that they need, but
-		// which the upstream rejected. Since this new API does not cause any
-		// backwards incompatibility, we pull in their fork.
-		// See https://github.com/miekg/dns/pull/949#issuecomment-487832458 for
-		// more information about the fork.
-		"github.com/miekg/dns", "github.com/cilium/dns", "8e25ec9a0ff3",
-	).replace(
-		// Cilium forks this library (a Go Kafka client) to apply the following
-		// patches on top:
-		//   - 01ce283: Fix de/serialization of null arrays
-		//   - c411825: Correcly check msgSize in ReadResp before discarding.
-		//   - 947cc36: Kafka : Cilium panics with error *index out of range
-		//              error* on receiving messages of very large size.
-		// serge@ has not found any trace of the Cilium project trying to
-		// upstream this, but the patches seem to be only bugfixes, not
-		// breaking functionality.
-		// However, the fork-off point of the upstream project is fairly old
-		// (commit b5a758db, dated Dec 7, 2017 - pre v1.5.0 of upstream). This
-		// might cause issues in the future when we start to have other
-		// consumers of this library.
-		"github.com/optiopay/kafka", "github.com/cilium/kafka", "01ce283b732b",
-	).use(
-		"github.com/hashicorp/go-immutable-radix",
-		"github.com/sasha-s/go-deadlock",
-		"github.com/google/gopacket",
-		"github.com/hashicorp/consul/api",
-		"github.com/pborman/uuid",
-		"github.com/petermattis/goid",
-		"github.com/kr/text",
-		"github.com/hashicorp/go-cleanhttp",
-		"github.com/hashicorp/serf",
-		"github.com/joho/godotenv",
-		"github.com/envoyproxy/protoc-gen-validate",
-		"github.com/hashicorp/go-rootcerts",
-		"github.com/armon/go-metrics",
-		"github.com/shirou/gopsutil",
-		"github.com/cncf/udpa/go",
-		"github.com/cpuguy83/go-md2man/v2",
-		"github.com/russross/blackfriday/v2",
-		"github.com/shurcooL/sanitized_anchor_name",
-		"github.com/google/gops",
-		"github.com/mattn/go-shellwords",
-		"github.com/c9s/goprocinfo",
-		"github.com/cilium/ipam",
-		"github.com/kardianos/osext",
-		"github.com/servak/go-fastping",
-		"github.com/golang/snappy",
-		"github.com/cilium/arping",
-	).with(disabledProtoBuild, forceBazelGeneration).use(
-		"github.com/cilium/proxy",
-	).with(disabledProtoBuild, buildExtraArgs("-exclude=src")).use(
-		// -exclude=src fixes a build issue with Gazelle. See:
-		// https://github.com/census-instrumentation/opencensus-proto/issues/200
-		"github.com/census-instrumentation/opencensus-proto",
-	)
-}
diff --git a/build/fietsje/deps_containerd.go b/build/fietsje/deps_containerd.go
index 79b46aa..5172ffe 100644
--- a/build/fietsje/deps_containerd.go
+++ b/build/fietsje/deps_containerd.go
@@ -73,6 +73,7 @@
 		"github.com/prometheus/procfs",
 		"github.com/russross/blackfriday/v2",
 		"github.com/seccomp/libseccomp-golang",
+		"github.com/shurcooL/sanitized_anchor_name",
 		"github.com/sirupsen/logrus",
 		"github.com/syndtr/gocapability",
 		"github.com/tchap/go-patricia",
diff --git a/build/fietsje/main.go b/build/fietsje/main.go
index f9671a3..7be1107 100644
--- a/build/fietsje/main.go
+++ b/build/fietsje/main.go
@@ -65,7 +65,6 @@
 	depsKubernetes(p)
 	depsContainerd(p)
 	depsGVisor(p)
-	depsCilium(p)
 
 	// our own deps, common
 	p.collectOverride("go.uber.org/zap", "v1.15.0")
@@ -83,25 +82,28 @@
 	p.collect("github.com/rekby/gpt", "a930afbc6edcc89c83d39b79e52025698156178d")
 	p.collect("github.com/yalue/native_endian", "51013b03be4fd97b0aabf29a6923e60359294186")
 
-	// used by //core/cmd/mkimage
+	// Used by //metropolis/build/mkimage
 	p.collect("github.com/diskfs/go-diskfs", "v1.0.0").use(
 		"gopkg.in/djherbis/times.v1",
 	)
 
+	// Used by //metropolis/build/genosrelease
+	p.collect("github.com/joho/godotenv", "v1.3.0")
+
 	// used by //build/bindata
 	p.collect("github.com/kevinburke/go-bindata", "v3.16.0")
 
-	// used by deltagen
-	p.collectOverride("github.com/lyft/protoc-gen-star", "v0.4.14")
-
 	// for interactive debugging during development (//:dlv alias)
 	depsDelve(p)
 
-	// Used by //core/cmd/nanoswitch
+	// Used by //metropolis/test/nanoswitch
 	p.collect("github.com/google/nftables", "7127d9d22474b437f0e8136ddb21855df29790bf").use(
 		"github.com/koneu/natend",
 	)
 
+	// Used by //metropolis/node/core/network/dhcp4c
+	p.collect("github.com/google/gopacket", "v1.1.17")
+
 	// used by //core//kubernetes/clusternet
 	p.collect("golang.zx2c4.com/wireguard/wgctrl", "ec7f26be9d9e47a32a2789f8c346031978485cbf").use(
 		"github.com/mdlayher/netlink",
@@ -121,10 +123,11 @@
 		"github.com/caddyserver/caddy",
 		"github.com/dnstap/golang-dnstap",
 		"github.com/farsightsec/golang-framestream",
-		"github.com/infobloxopen/go-trees",
-		"github.com/opentracing/opentracing-go",
-		"github.com/grpc-ecosystem/grpc-opentracing",
 		"github.com/flynn/go-shlex",
+		"github.com/grpc-ecosystem/grpc-opentracing",
+		"github.com/infobloxopen/go-trees",
+		"github.com/miekg/dns",
+		"github.com/opentracing/opentracing-go",
 	)
 
 	// goimports