diff --git a/doc/releasenotes/16_0_0_summary.md b/doc/releasenotes/16_0_0_summary.md
index c1d66e71698..9c79cb19b7b 100644
--- a/doc/releasenotes/16_0_0_summary.md
+++ b/doc/releasenotes/16_0_0_summary.md
@@ -56,6 +56,10 @@ The flag is available in these components:
 
 ### Breaking Changes
 
+#### Default MySQL version on Docker
+
+The default MySQL version use by our `vitess/lite:latest` image is going from `5.7` to `8.0`. Additionally, the default version of the `vitess/lite:mysql80` image goes from `8.0.23` to `8.0.31`.
+
 #### vtctld UI Removal
 In v13, the vtctld UI was deprecated. As of this release, the `web/vtctld2` directory is deleted and the UI will no longer be included in any Vitess images going forward. All build scripts and the Makefile have been updated to reflect this change.
 
diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile
index ecf4d2209de..169efb6c96a 100644
--- a/docker/base/Dockerfile
+++ b/docker/base/Dockerfile
@@ -12,17 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# NOTE: This file is also symlinked as "Dockerfile" in the root of our
-#       repository because the automated build feature on Docker Hub does not
-#       allow to specify a different build context. It always assumes that the
-#       build context is the same directory as the Dockerfile is in.
-#       "make build" below must be called in our repository's root and
-#       therefore we need to have the symlinked "Dockerfile" in there as well.
-# TODO(mberlin): Remove the symlink and this note once
-# https://github.com/docker/hub-feedback/issues/292 is fixed.
-
 ARG bootstrap_version=14
-ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
+ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"
 
 FROM "${image}"
 
diff --git a/docker/base/Dockerfile.mysql57 b/docker/base/Dockerfile.mysql57
new file mode 100644
index 00000000000..a08e855f56a
--- /dev/null
+++ b/docker/base/Dockerfile.mysql57
@@ -0,0 +1,41 @@
+# Copyright 2023 The Vitess Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ARG bootstrap_version=14
+ARG image="vitess/bootstrap:${bootstrap_version}-mysql57"
+
+FROM "${image}"
+
+# Allows some docker builds to disable CGO
+ARG CGO_ENABLED=0
+
+# Allows docker builds to set the BUILD_NUMBER
+ARG BUILD_NUMBER
+
+# Allows docker builds to set the BUILD_GIT_BRANCH
+ARG BUILD_GIT_BRANCH
+
+# Allows docker builds to set the BUILD_GIT_REV
+ARG BUILD_GIT_REV
+
+# Re-copy sources from working tree
+USER root
+COPY . /vt/src/vitess.io/vitess
+
+# Build Vitess
+RUN make build
+
+# Fix permissions
+RUN chown -R vitess:vitess /vt
+USER vitess
diff --git a/docker/base/Dockerfile.mysql80 b/docker/base/Dockerfile.mysql80
deleted file mode 100644
index ea662d12b6f..00000000000
--- a/docker/base/Dockerfile.mysql80
+++ /dev/null
@@ -1,27 +0,0 @@
-ARG bootstrap_version=14
-ARG image="vitess/bootstrap:${bootstrap_version}-mysql80"
-
-FROM "${image}"
-
-# Allows some docker builds to disable CGO
-ARG CGO_ENABLED=0
-
-# Allows docker builds to set the BUILD_NUMBER
-ARG BUILD_NUMBER
-
-# Allows docker builds to set the BUILD_GIT_BRANCH
-ARG BUILD_GIT_BRANCH
-
-# Allows docker builds to set the BUILD_GIT_REV
-ARG BUILD_GIT_REV
-
-# Re-copy sources from working tree
-USER root
-COPY . /vt/src/vitess.io/vitess
-
-# Build Vitess
-RUN make build
-
-# Fix permissions
-RUN chown -R vitess:vitess /vt
-USER vitess
diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57
index 9a82ab528b0..f784ecbb4b1 100644
--- a/docker/base/Dockerfile.percona57
+++ b/docker/base/Dockerfile.percona57
@@ -1,3 +1,17 @@
+# Copyright 2023 The Vitess Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ARG bootstrap_version=14
 ARG image="vitess/bootstrap:${bootstrap_version}-percona57"
 
diff --git a/docker/base/Dockerfile.percona80 b/docker/base/Dockerfile.percona80
index d2f5ee3b1a6..dbf2e7e10e7 100644
--- a/docker/base/Dockerfile.percona80
+++ b/docker/base/Dockerfile.percona80
@@ -1,3 +1,17 @@
+# Copyright 2023 The Vitess Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 ARG bootstrap_version=14
 ARG image="vitess/bootstrap:${bootstrap_version}-percona80"
 
diff --git a/docker/lite/Dockerfile b/docker/lite/Dockerfile
index c0929ac9ed2..e058f627eca 120000
--- a/docker/lite/Dockerfile
+++ b/docker/lite/Dockerfile
@@ -1 +1 @@
-Dockerfile.mysql57
\ No newline at end of file
+Dockerfile.mysql80
\ No newline at end of file
diff --git a/docker/lite/install_dependencies.sh b/docker/lite/install_dependencies.sh
index 8722eb60b11..cff035c2319 100755
--- a/docker/lite/install_dependencies.sh
+++ b/docker/lite/install_dependencies.sh
@@ -83,7 +83,7 @@ mysql57)
     )
     ;;
 mysql80)
-    mysql8_version=8.0.23
+    mysql8_version=8.0.31
     do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/libmysqlclient21_${mysql8_version}-1debian10_amd64.deb /tmp/libmysqlclient21_${mysql8_version}-1debian10_amd64.deb
     do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client-core_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-community-client-core_${mysql8_version}-1debian10_amd64.deb
     do_fetch https://repo.mysql.com/apt/debian/pool/mysql-8.0/m/mysql-community/mysql-community-client-plugins_${mysql8_version}-1debian10_amd64.deb /tmp/mysql-community-client-plugins_${mysql8_version}-1debian10_amd64.deb