diff --git a/4.2/Dockerfile b/4.2/Dockerfile
index a6fbf19..f6b893c 100644
--- a/4.2/Dockerfile
+++ b/4.2/Dockerfile
@@ -94,15 +94,15 @@ RUN set -eux; \
 	./configure \
 		--target-list=' \
 # system targets
-# (https://sources.debian.org/src/qemu/stretch/debian/rules/#L57-L61, slimmed)
+# (https://sources.debian.org/src/qemu/buster/debian/rules/#L59-L63, slimmed)
 			i386-softmmu x86_64-softmmu aarch64-softmmu arm-softmmu m68k-softmmu \
-			mips64-softmmu mips64el-softmmu ppc64-softmmu \
+			mips64-softmmu mips64el-softmmu ppc64-softmmu riscv64-softmmu \
 			sparc64-softmmu s390x-softmmu \
 # user targets
-# (https://sources.debian.org/src/qemu/stretch/debian/rules/#L81-L86, slimmed)
+# (https://sources.debian.org/src/qemu/buster/debian/rules/#L83-L88, slimmed)
 			i386-linux-user x86_64-linux-user aarch64-linux-user arm-linux-user m68k-linux-user \
 			mips64-linux-user mips64el-linux-user \
-			ppc64-linux-user ppc64le-linux-user sparc64-linux-user \
+			ppc64-linux-user ppc64le-linux-user riscv64-linux-user sparc64-linux-user \
 			s390x-linux-user \
 		' \
 		--disable-docs \
diff --git a/5.0/Dockerfile b/5.0/Dockerfile
index 656c342..36b9d1e 100644
--- a/5.0/Dockerfile
+++ b/5.0/Dockerfile
@@ -94,15 +94,15 @@ RUN set -eux; \
 	./configure \
 		--target-list=' \
 # system targets
-# (https://sources.debian.org/src/qemu/stretch/debian/rules/#L57-L61, slimmed)
+# (https://sources.debian.org/src/qemu/buster/debian/rules/#L59-L63, slimmed)
 			i386-softmmu x86_64-softmmu aarch64-softmmu arm-softmmu m68k-softmmu \
-			mips64-softmmu mips64el-softmmu ppc64-softmmu \
+			mips64-softmmu mips64el-softmmu ppc64-softmmu riscv64-softmmu \
 			sparc64-softmmu s390x-softmmu \
 # user targets
-# (https://sources.debian.org/src/qemu/stretch/debian/rules/#L81-L86, slimmed)
+# (https://sources.debian.org/src/qemu/buster/debian/rules/#L83-L88, slimmed)
 			i386-linux-user x86_64-linux-user aarch64-linux-user arm-linux-user m68k-linux-user \
 			mips64-linux-user mips64el-linux-user \
-			ppc64-linux-user ppc64le-linux-user sparc64-linux-user \
+			ppc64-linux-user ppc64le-linux-user riscv64-linux-user sparc64-linux-user \
 			s390x-linux-user \
 		' \
 		--disable-docs \
diff --git a/5.1/Dockerfile b/5.1/Dockerfile
index 4dd643e..642688a 100644
--- a/5.1/Dockerfile
+++ b/5.1/Dockerfile
@@ -94,15 +94,15 @@ RUN set -eux; \
 	./configure \
 		--target-list=' \
 # system targets
-# (https://sources.debian.org/src/qemu/stretch/debian/rules/#L57-L61, slimmed)
+# (https://sources.debian.org/src/qemu/buster/debian/rules/#L59-L63, slimmed)
 			i386-softmmu x86_64-softmmu aarch64-softmmu arm-softmmu m68k-softmmu \
-			mips64-softmmu mips64el-softmmu ppc64-softmmu \
+			mips64-softmmu mips64el-softmmu ppc64-softmmu riscv64-softmmu \
 			sparc64-softmmu s390x-softmmu \
 # user targets
-# (https://sources.debian.org/src/qemu/stretch/debian/rules/#L81-L86, slimmed)
+# (https://sources.debian.org/src/qemu/buster/debian/rules/#L83-L88, slimmed)
 			i386-linux-user x86_64-linux-user aarch64-linux-user arm-linux-user m68k-linux-user \
 			mips64-linux-user mips64el-linux-user \
-			ppc64-linux-user ppc64le-linux-user sparc64-linux-user \
+			ppc64-linux-user ppc64le-linux-user riscv64-linux-user sparc64-linux-user \
 			s390x-linux-user \
 		' \
 		--disable-docs \
diff --git a/5.2/Dockerfile b/5.2/Dockerfile
index 156f7a6..824f63c 100644
--- a/5.2/Dockerfile
+++ b/5.2/Dockerfile
@@ -97,15 +97,15 @@ RUN set -eux; \
 	./configure \
 		--target-list=' \
 # system targets
-# (https://sources.debian.org/src/qemu/stretch/debian/rules/#L57-L61, slimmed)
+# (https://sources.debian.org/src/qemu/buster/debian/rules/#L59-L63, slimmed)
 			i386-softmmu x86_64-softmmu aarch64-softmmu arm-softmmu m68k-softmmu \
-			mips64-softmmu mips64el-softmmu ppc64-softmmu \
+			mips64-softmmu mips64el-softmmu ppc64-softmmu riscv64-softmmu \
 			sparc64-softmmu s390x-softmmu \
 # user targets
-# (https://sources.debian.org/src/qemu/stretch/debian/rules/#L81-L86, slimmed)
+# (https://sources.debian.org/src/qemu/buster/debian/rules/#L83-L88, slimmed)
 			i386-linux-user x86_64-linux-user aarch64-linux-user arm-linux-user m68k-linux-user \
 			mips64-linux-user mips64el-linux-user \
-			ppc64-linux-user ppc64le-linux-user sparc64-linux-user \
+			ppc64-linux-user ppc64le-linux-user riscv64-linux-user sparc64-linux-user \
 			s390x-linux-user \
 		' \
 		--disable-docs \
diff --git a/Dockerfile.template b/Dockerfile.template
index d2800d2..bc1b9b4 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -93,15 +93,15 @@ RUN set -eux; \
 	./configure \
 		--target-list=' \
 # system targets
-# (https://sources.debian.org/src/qemu/stretch/debian/rules/#L57-L61, slimmed)
+# (https://sources.debian.org/src/qemu/buster/debian/rules/#L59-L63, slimmed)
 			i386-softmmu x86_64-softmmu aarch64-softmmu arm-softmmu m68k-softmmu \
-			mips64-softmmu mips64el-softmmu ppc64-softmmu \
+			mips64-softmmu mips64el-softmmu ppc64-softmmu riscv64-softmmu \
 			sparc64-softmmu s390x-softmmu \
 # user targets
-# (https://sources.debian.org/src/qemu/stretch/debian/rules/#L81-L86, slimmed)
+# (https://sources.debian.org/src/qemu/buster/debian/rules/#L83-L88, slimmed)
 			i386-linux-user x86_64-linux-user aarch64-linux-user arm-linux-user m68k-linux-user \
 			mips64-linux-user mips64el-linux-user \
-			ppc64-linux-user ppc64le-linux-user sparc64-linux-user \
+			ppc64-linux-user ppc64le-linux-user riscv64-linux-user sparc64-linux-user \
 			s390x-linux-user \
 		' \
 		--disable-docs \