diff --git a/Dockerfile b/Dockerfile
index 87d5a4e..a1ef791 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,8 +43,9 @@ RUN sed -i -e 's/exec \$JAVA_BIN/podman system service -t0\&\n        exec \$JAV
 ENV XDG_RUNTIME_DIR=/home/$BUILDUSER/agent/xdg-run
 ENV XDG_CONFIG_HOME=/home/$BUILDUSER/.config
 
-ENV BUILDAH_ISOLATION=chroot
-ENV _CONTAINERS_USERNS_CONFIGURED=""
+# Not needed on containerd and actually breaks `podman build`
+#ENV BUILDAH_ISOLATION=chroot
+#ENV _CONTAINERS_USERNS_CONFIGURED=""
 
 # Until we setup the logging and metrics pipelines in OTEL
 ENV OTEL_LOGS_EXPORTER=none