diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 90bde6fdec..30fb8b27c5 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -526,7 +526,7 @@ function create_registry_container {
     container=$(sudo docker ps -a --format "{{.Names}}" --filter name=registry)
     if [ -z $container ]; then
         sudo docker run -d --net=host -e REGISTRY_HTTP_ADDR=0.0.0.0:4000 --restart=always -v /opt/trove_registry/:/var/lib/registry --name registry registry:2
-        for img in {"mysql:5.7.29","mysql:8.0","mariadb:10.4","postgres:12"};
+        for img in {"mysql:5.7","mysql:8.0","mariadb:10.4","postgres:12"};
         do
         sudo docker pull ${img} && sudo docker tag ${img} 127.0.0.1:4000/trove-datastores/${img} && sudo docker push 127.0.0.1:4000/trove-datastores/${img}
         done
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index de920f9991..ea3971f383 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -300,7 +300,7 @@
         Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
         TROVE_ENABLE_LOCAL_REGISTRY: True
         SYNC_LOG_TO_CONTROLLER: True
-        TROVE_DATASTORE_VERSION: 5.7.29
+        TROVE_DATASTORE_VERSION: 5.7
       devstack_local_conf:
         post-config:
           $TROVE_CONF:
@@ -311,7 +311,7 @@
             auth:
               tempest_roles: ResellerAdmin
             database:
-              default_datastore_versions: mysql:5.7.29
+              default_datastore_versions: mysql:5.7
       devstack_plugins:
         trove: https://opendev.org/openstack/trove.git
       devstack_services: