diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index 9b5fd2b6d..591c9dfd4 100644
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -4,13 +4,7 @@ function install_pkgs() {
   export DEBIAN_FRONTEND=noninteractive
   while true; do
     if sudo -E apt-get update && \
-       sudo -E apt-get install -y \
-                       -o Dpkg::Options::=--force-confold \
-                       -o Dpkg::Options::=--force-confdef \
-                       --allow-downgrades \
-                       --allow-remove-essential \
-                       --allow-change-held-packages \
-                       "$@"; then
+       sudo -E apt-get install -y "$@"; then
       break
     fi
   done
diff --git a/tools/install_containerd.sh b/tools/install_containerd.sh
index 8cddba4cf..af5e50c62 100755
--- a/tools/install_containerd.sh
+++ b/tools/install_containerd.sh
@@ -62,6 +62,7 @@ fi
 readonly BTRFS_DEV
 
 # Install dependencies for the crictl tests.
+export DEBIAN_FRONTEND=noninteractive
 while true; do
   if (apt-get update && apt-get install -y \
       "${BTRFS_DEV}" \