diff --git a/5.7/Dockerfile b/5.7/Dockerfile
index 88edd0629..46b881e0d 100644
--- a/5.7/Dockerfile
+++ b/5.7/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r mysql && useradd -r -g mysql mysql
@@ -46,9 +46,9 @@ RUN set -ex; \
 	apt-key list > /dev/null
 
 ENV MYSQL_MAJOR 5.7
-ENV MYSQL_VERSION 5.7.29-1debian9
+ENV MYSQL_VERSION 5.7.29-1debian10
 
-RUN echo "deb http://repo.mysql.com/apt/debian/ stretch mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
+RUN echo "deb http://repo.mysql.com/apt/debian/ buster mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
 
 # the "/var/lib/mysql" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already "configured" (ie, stuff in /var/lib/mysql/mysql)
 # also, we set debconf keys to make APT a little quieter
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
index 05c01f636..bc8ff23e8 100644
--- a/8.0/Dockerfile
+++ b/8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r mysql && useradd -r -g mysql mysql
@@ -46,9 +46,9 @@ RUN set -ex; \
 	apt-key list > /dev/null
 
 ENV MYSQL_MAJOR 8.0
-ENV MYSQL_VERSION 8.0.19-1debian9
+ENV MYSQL_VERSION 8.0.19-1debian10
 
-RUN echo "deb http://repo.mysql.com/apt/debian/ stretch mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
+RUN echo "deb http://repo.mysql.com/apt/debian/ buster mysql-${MYSQL_MAJOR}" > /etc/apt/sources.list.d/mysql.list
 
 # the "/var/lib/mysql" stuff here is because the mysql-server postinst doesn't have an explicit way to disable the mysql_install_db codepath besides having a database already "configured" (ie, stuff in /var/lib/mysql/mysql)
 # also, we set debconf keys to make APT a little quieter
diff --git a/update.sh b/update.sh
index d533c52c6..75a2ecdf2 100755
--- a/update.sh
+++ b/update.sh
@@ -9,14 +9,14 @@ if [ ${#versions[@]} -eq 0 ]; then
 fi
 versions=( "${versions[@]%/}" )
 
-defaultDebianVariant='stretch-slim'
+defaultDebianVariant='buster-slim'
 declare -A debianVariants=(
-	#[5.5]='jessie'
+	[5.6]='stretch-slim'
 )
 
 for version in "${versions[@]}"; do
 	debianVariant="${debianVariants[$version]:-$defaultDebianVariant}"
-	debianSuite="${debianVariant%%-*}" # "stretch", etc
+	debianSuite="${debianVariant%%-*}" # "buster", etc
 
 	cp -a .template.Debian/docker-entrypoint.sh "$version/docker-entrypoint.sh"