diff --git a/releases/weekly/portage/cloud-stages/package.keywords/releng/cloud b/releases/weekly/portage/cloud-stages/package.keywords/releng/cloud
deleted file mode 100644
index cd015667..00000000
--- a/releases/weekly/portage/cloud-stages/package.keywords/releng/cloud
+++ /dev/null
@@ -1 +0,0 @@
-app-emulation/cloud-init
diff --git a/releases/weekly/portage/cloud-stages/package.keywords/releng/portage b/releases/weekly/portage/cloud-stages/package.keywords/releng/portage
deleted file mode 100644
index c3929a75..00000000
--- a/releases/weekly/portage/cloud-stages/package.keywords/releng/portage
+++ /dev/null
@@ -1 +0,0 @@
-=sys-apps/portage-2.3.24
diff --git a/releases/weekly/portage/cloud-stages/package.use/releng/grub b/releases/weekly/portage/cloud-stages/package.use/releng/grub
deleted file mode 100644
index 4b84ae65..00000000
--- a/releases/weekly/portage/cloud-stages/package.use/releng/grub
+++ /dev/null
@@ -1 +0,0 @@
-sys-boot/grub grub_platforms_pc
diff --git a/releases/weekly/portage/cloud-stages/package.use/releng/iputils b/releases/weekly/portage/cloud-stages/package.use/releng/iputils
deleted file mode 100644
index 9cde931b..00000000
--- a/releases/weekly/portage/cloud-stages/package.use/releng/iputils
+++ /dev/null
@@ -1 +0,0 @@
-net-misc/iputils -caps -filecaps
diff --git a/releases/weekly/portage/cloud-stages/package.use/releng/portage b/releases/weekly/portage/cloud-stages/package.use/releng/portage
deleted file mode 100644
index 2dedcf80..00000000
--- a/releases/weekly/portage/cloud-stages/package.use/releng/portage
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/portage -rsync-verify
diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
index a4b90390..b2c847e3 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
@@ -28,7 +28,6 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
 stage4/rcadd:
 	acpid|default
 	net.lo|default
diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
index 33d86be5..1944ced4 100644
--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
@@ -28,7 +28,6 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
 stage4/rcadd:
 	acpid|default
 	net.lo|default
diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec b/releases/weekly/specs/amd64/stage4-minimal.spec
index 68ccf01a..a868b635 100644
--- a/releases/weekly/specs/amd64/stage4-minimal.spec
+++ b/releases/weekly/specs/amd64/stage4-minimal.spec
@@ -28,7 +28,6 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
 stage4/rcadd:
 	acpid|default
 	net.lo|default
diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
index 56baa012..76bf8106 100644
--- a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
+++ b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
@@ -28,7 +28,6 @@ stage4/packages:
 	sys-devel/bc
 	sys-power/acpid
 stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
 stage4/rcadd:
 	acpid|default
 	net.lo|default
diff --git a/releases/weekly/specs/amd64/stage4-systemd.spec b/releases/weekly/specs/amd64/stage4-systemd.spec
index 61af9a31..5b1d5590 100644
--- a/releases/weekly/specs/amd64/stage4-systemd.spec
+++ b/releases/weekly/specs/amd64/stage4-systemd.spec
@@ -39,7 +39,6 @@ stage4/packages:
 	sys-power/acpid
 	sys-process/cronie
 stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
-stage4/root_overlay: @REPO_DIR@/releases/weekly/overlays/cloud-overlay
 stage4/rcadd:
 	acpid|default
 	cloud-config|default