diff --git a/Dockerfile b/Dockerfile
index 8f15b17..207049b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,11 +24,11 @@ RUN mkdir /builder /builder/.config && chown -R 65534:65534 /builder
 # This works around https://github.com/redhat-actions/podman-login/pull/43, until this PR is merged at least
 RUN mkdir /builder/.docker && chown -R 65534:65534 /builder/.docker
 
-RUN setcap cap_setuid=ep /usr/bin/newuidmap cap_setgid=ep /usr/bin/newgidmap
-
 RUN find / -mindepth 1 -path /proc -prune -or -path /sys -prune -or -path /dev -prune -or -type f -perm /6000 -exec sh -c "chmod ug-s '{}' && echo \"Removed setuid/setgid bit(s) from '{}'\"" \;
 
-RUN getcap -r / | awk '{ print $1 }' | grep -vE '/usr/bin/new[ug]idmap' | xargs -I '{}' sh -c "setcap -r '{}' && echo \"Removed file capability bit(s) from '{}'\""
+RUN getcap -r / | awk '{ print $1 }' | xargs -I '{}' sh -c "setcap -r '{}' && echo \"Removed file capability bit(s) from '{}'\""
+
+RUN setcap cap_setuid=ep /usr/bin/newuidmap cap_setgid=ep /usr/bin/newgidmap
 
 RUN shopt -s dotglob && rm -rf /var/cache/* /tmp/* /var/tmp/*