diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 90bde2493e..768ebd2dd3 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -37,28 +37,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'git',
         'jq',
         'libffi-dev',
+        'libmariadbclient-dev',
         'libssl-dev',
         'libxslt1-dev',
         'mariadb-client',
         'python-dev'
      ] %}
-
-    {% if base_arch == 'aarch64' and base_distro == 'ubuntu' %}
-         {% set kolla_toolbox_packages = kolla_toolbox_packages + [
-             'libmysqlclient-dev'
-         ] %}
-    {% else %}
-         {% set kolla_toolbox_packages = kolla_toolbox_packages + [
-             'libmariadbclient-dev'
-         ] %}
-    {% endif %}
-    # Debian/stretch ships libmysqlclient.so in separate package
-    {% if base_distro == 'debian' %}
-        {% set kolla_toolbox_packages = kolla_toolbox_packages + [
-            'libmariadbclient-dev-compat'
-        ] %}
-    {% endif %}
-
 {% endif %}
 {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
 
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index bebf79c1be..ad001488bb 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -228,7 +228,9 @@ ENV DEBIAN_FRONTEND noninteractive
             'ca-certificates',
             'git',
             'libffi-dev',
+            'libmariadbclient-dev',
             'libpq-dev',
+            'libssl-dev',
             'libxml2-dev',
             'libxslt1-dev',
             'libyaml-dev',
@@ -238,28 +240,6 @@ ENV DEBIAN_FRONTEND noninteractive
             'zip'
         ] %}
 
-        {% if base_arch == 'aarch64' and base_distro == 'ubuntu' %}
-             {% set openstack_base_packages = openstack_base_packages + [
-                 'libmysqlclient-dev'
-             ] %}
-        {% else %}
-             {% set openstack_base_packages = openstack_base_packages + [
-                 'libmariadbclient-dev'
-             ] %}
-        {% endif %}
-
-        # Debian/stretch ships libmysqlclient.so in separate package
-        # Debian/stretch uses OpenSSL 1.1 as default, we need 1.0.2 one
-        {% if base_distro == 'debian' %}
-            {% set openstack_base_packages = openstack_base_packages + [
-                'libmariadbclient-dev-compat',
-                'libssl1.0-dev',
-            ] %}
-        {% else %}
-            {% set openstack_base_packages = openstack_base_packages + [
-                'libssl-dev',
-            ] %}
-        {% endif %}
     {% endif %}
 
 {{ macros.install_packages(openstack_base_packages | customizable("packages")) }}