diff --git a/Containerfile.compute_worker_podman b/Containerfile.compute_worker_podman
index 67efbed76..9c96ead37 100644
--- a/Containerfile.compute_worker_podman
+++ b/Containerfile.compute_worker_podman
@@ -2,6 +2,8 @@ FROM fedora:37
 
 # Include deps
 RUN dnf -y update && \
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1995337#c3
+    rpm --setcaps shadow-utils 2>/dev/null && \
     dnf -y install podman fuse-overlayfs python3.8 python3-pip \
         --exclude container-selinux && \
     dnf clean all && \
diff --git a/Containerfile.compute_worker_podman_gpu b/Containerfile.compute_worker_podman_gpu
index f3eba9454..0ef68e1a2 100644
--- a/Containerfile.compute_worker_podman_gpu
+++ b/Containerfile.compute_worker_podman_gpu
@@ -1,8 +1,8 @@
 FROM fedora:37
 
 # Include deps
-RUN curl -s -L https://developer.download.nvidia.com/compute/cuda/repos/rhel9/x86_64/cuda-rhel9.repo | sudo tee /etc/yum.repos.d/cuda.repo && \
-    curl -s -L https://nvidia.github.io/nvidia-docker/rhel9.0/nvidia-docker.repo | sudo tee /etc/yum.repos.d/nvidia-docker.repo && \
+RUN curl -s -L https://developer.download.nvidia.com/compute/cuda/repos/rhel9/x86_64/cuda-rhel9.repo | tee /etc/yum.repos.d/cuda.repo && \
+    curl -s -L https://nvidia.github.io/nvidia-docker/rhel9.0/nvidia-docker.repo | tee /etc/yum.repos.d/nvidia-docker.repo && \
     rpm -Uvh http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm && \
     rpm -Uvh http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \
     dnf -y update && \