diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2
index 2fbfc24d79..5cb53092b2 100644
--- a/docker/barbican/barbican-base/Dockerfile.j2
+++ b/docker/barbican/barbican-base/Dockerfile.j2
@@ -27,7 +27,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% set barbican_base_pip_packages = [
     '/barbican',
-    'MySQL-python',
+    'mysqlclient',
     'pastedeploy',
     'python-barbicanclient',
     'uwsgi'
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 0fc920adaa..49cf839a7f 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -81,7 +81,7 @@ ENV PATH {{ virtualenv_path }}/bin:$PATH
         'ansible==2.2.0.0',
         '"cmd2<0.9.0"',
         'influxdb',
-        'MySQL-python',
+        'mysqlclient',
         'os-client-config==1.29.0',
         'pbr==4.0.0',
         'pymongo',
diff --git a/docker/mariadb/Dockerfile.j2 b/docker/mariadb/Dockerfile.j2
index 9e22986687..d63bcb83eb 100644
--- a/docker/mariadb/Dockerfile.j2
+++ b/docker/mariadb/Dockerfile.j2
@@ -14,7 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'hostname',
         'mariadb',
         'mariadb-server-galera',
-        'percona-xtrabackup',
+        'mariadb-backup',
         'pv',
         'rsync',
         'tar'
@@ -31,7 +31,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% else %}
         {% set mariadb_packages = mariadb_packages + [
             'mariadb-server',
-            'percona-xtrabackup'
+            'mariadb-client'
         ] %}
     {% endif %}
 {% endif %}
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 9bf0369399..f0d3e15baf 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -320,7 +320,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \
         'kombu',
         'monotonic',
         'msgpack-python',
-        'MySQL-python',
+        'mysqlclient',
         'netaddr',
         'netifaces',
         'os-client-config',