diff --git a/ci/cfengine-build-host-setup.cf b/ci/cfengine-build-host-setup.cf
index 2a2db9a3c..d26694f00 100644
--- a/ci/cfengine-build-host-setup.cf
+++ b/ci/cfengine-build-host-setup.cf
@@ -41,11 +41,11 @@ bundle agent cfengine_build_host_setup
       "rsync" comment => "added for debian-10";
       "systemd-coredump" comment => "added step to jenkins testing-pr job to query for coredumps on failures";
 
-    debian_10|ubuntu_20::
+    ubuntu_20::
       "libncurses5";
       "libncurses5-dev";
 
-    (debian|ubuntu).!(debian_9|debian_10|ubuntu_16|ubuntu_18|ubuntu_20)::
+    (debian|ubuntu).!(debian_9|ubuntu_16|ubuntu_18|ubuntu_20)::
       "libncurses6";
       "libncurses-dev";
 
diff --git a/ci/distribution-patched.sh b/ci/distribution-patched.sh
index edc0ee339..8f044c9c0 100755
--- a/ci/distribution-patched.sh
+++ b/ci/distribution-patched.sh
@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 set -ex
-if grep CODENAME=stretch /etc/os-release; then
-  echo "deb http://archive.debian.org/debian-archive/debian stretch main" >/etc/apt/sources.list
-  echo "deb http://archive.debian.org/debian-archive/debian stretch-backports main" >>/etc/apt/sources.list
-fi
+for debian_release in stretch buster; do
+  if grep "CODENAME=$debian_release" /etc/os-release; then
+    echo "deb http://archive.debian.org/debian-archive/debian ${debian_release} main" >/etc/apt/sources.list
+    echo "deb http://archive.debian.org/debian-archive/debian ${debian_release}-backports main" >>/etc/apt/sources.list
+  fi
+done
 if [ -f /etc/centos-release ]; then
   _version=$(cat /etc/centos-release | cut -d' ' -f3 | cut -d. -f1)
   if [ "$_version" = "6" ] || [ "$_version" = "7" ]; then