diff --git a/releases/weekly/portage/stages/package.use/iputils b/releases/weekly/portage/stages/package.use/iputils
index 9cde931b..4257bb4c 100644
--- a/releases/weekly/portage/stages/package.use/iputils
+++ b/releases/weekly/portage/stages/package.use/iputils
@@ -1 +1,2 @@
+# Disable caps and filecaps or ping on the stage will only work for root
 net-misc/iputils -caps -filecaps
diff --git a/releases/weekly/portage/stages/package.use/pam b/releases/weekly/portage/stages/package.use/pam
new file mode 100644
index 00000000..196ad1b7
--- /dev/null
+++ b/releases/weekly/portage/stages/package.use/pam
@@ -0,0 +1,2 @@
+# Disable filecaps or we get a circular dep between sys-libs/pam and sys-libs/filecaps
+sys-libs/pam -filecaps