diff --git a/Dockerfile.build-debian b/Dockerfile.build-debian
index 36c51765412a69b89f3ab6b51dbf88bd8fc68673..b143a532b34a71019aa446a3d735a450e0f16b1a 100644
--- a/Dockerfile.build-debian
+++ b/Dockerfile.build-debian
@@ -17,10 +17,8 @@ RUN apt-get install -y \
 			libcurl4-openssl-dev \
 			python-docutils \
 			valgrind \
-			peg
-
-RUN apt-get install -t stretch-backports -y \
-					libdrm-intel1
+			peg \
+			libdrm-intel1
 
 # autotools build deps
 RUN apt-get install -y \
diff --git a/Dockerfile.build-debian-arm64 b/Dockerfile.build-debian-arm64
index 3ea97807f8b002844a76b99fbb4825f2753bc1cf..573c7096feb8da1789f2520e556109e358a351fa 100644
--- a/Dockerfile.build-debian-arm64
+++ b/Dockerfile.build-debian-arm64
@@ -1,4 +1,4 @@
-FROM debian:stretch-backports
+FROM debian:buster
 
 RUN apt-get update
 RUN apt-get install -y \
@@ -30,12 +30,11 @@ RUN apt-get install -y \
 			libjson-c-dev:arm64 \
 			libcurl4-openssl-dev:arm64 \
 			libxrandr-dev:arm64 \
-			libxv-dev:arm64
+			libxv-dev:arm64 \
+			meson \
+			libdrm-dev:arm64 \
+			qemu-user \
+			qemu-user-static
 
-RUN apt-get install -t stretch-backports -y \
-					meson \
-					libdrm-dev:arm64 \
-					qemu-user \
-					qemu-user-static
 
 RUN apt-get clean
diff --git a/Dockerfile.build-debian-armhf b/Dockerfile.build-debian-armhf
index 3e429e2f18c7b4c7ef0e9c39c01e565f3975f9c9..737ca3645f1ba37bd694f7bdf19c2a4d7293be72 100644
--- a/Dockerfile.build-debian-armhf
+++ b/Dockerfile.build-debian-armhf
@@ -1,4 +1,4 @@
-FROM debian:stretch-backports
+FROM debian:buster
 
 RUN apt-get update
 RUN apt-get install -y \
@@ -30,12 +30,10 @@ RUN apt-get install -y \
 			libjson-c-dev:armhf \
 			libcurl4-openssl-dev:armhf \
 			libxrandr-dev:armhf \
-			libxv-dev:armhf
-
-RUN apt-get install -t stretch-backports -y \
-					meson \
-					libdrm-dev:armhf \
-					qemu-user \
-					qemu-user-static
+			libxv-dev:armhf \
+			meson \
+			libdrm-dev:armhf \
+			qemu-user \
+			qemu-user-static
 
 RUN apt-get clean
diff --git a/Dockerfile.build-debian-minimal b/Dockerfile.build-debian-minimal
index 7c23ffc2a0d9523d8e8349020606346b622fe57d..64edf4b4313ee482b7b2c5212fe31f1021c9cccf 100644
--- a/Dockerfile.build-debian-minimal
+++ b/Dockerfile.build-debian-minimal
@@ -1,4 +1,4 @@
-FROM debian:stretch-backports
+FROM debian:buster
 
 RUN apt-get update
 RUN apt-get install -y \
@@ -18,10 +18,8 @@ RUN apt-get install -y \
 			libudev-dev \
 			libxrandr-dev \
 			libxv-dev \
-			x11proto-dri2-dev
-
-RUN apt-get install -t stretch-backports -y \
-					meson \
-					libdrm-dev
+			x11proto-dri2-dev \
+			meson \
+			libdrm-dev
 
 RUN apt-get clean
diff --git a/Dockerfile.build-debian-mips b/Dockerfile.build-debian-mips
index e56e7e75174bc06cb20049cbf2d6d658db361a2c..7e4bacdf8ded4fbbe32f54afa174b3b45cd63279 100644
--- a/Dockerfile.build-debian-mips
+++ b/Dockerfile.build-debian-mips
@@ -1,3 +1,5 @@
+# we are stuck on stretch for mips:
+# https://bugs.debian.org/932725
 FROM debian:stretch-backports
 
 RUN apt-get update