diff --git a/docker/mariadb/mariadb-base/Dockerfile.j2 b/docker/mariadb/mariadb-base/Dockerfile.j2
index bf74281911..23c192213c 100644
--- a/docker/mariadb/mariadb-base/Dockerfile.j2
+++ b/docker/mariadb/mariadb-base/Dockerfile.j2
@@ -24,4 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.install_packages(mariadb_base_packages | customizable("packages")) }}
 
+RUN curl -o /usr/bin/clustercheck https://src.fedoraproject.org/rpms/mariadb/raw/10.3/f/clustercheck.sh \
+    && chmod 755 /usr/bin/clustercheck
+
 {% block mariadb_base_footer %}{% endblock %}
diff --git a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
index a62e29398e..aa52f8f4a7 100644
--- a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
+++ b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
@@ -5,24 +5,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% if base_package_type == 'rpm' %}
-    {% set mariadb_clustercheck_packages = [
-        'mariadb-server-galera',
-        'xinetd'
-    ] %}
-
-{% elif base_package_type == 'deb' %}
-    {% set mariadb_clustercheck_packages = [
-        'xinetd'
-    ] %}
-{% endif %}
+{% set mariadb_clustercheck_packages = [
+    'xinetd'
+] %}
 
 {{ macros.install_packages(mariadb_clustercheck_packages | customizable("packages")) }}
 
-{% if base_package_type == 'deb' %}
-RUN curl -o /usr/bin/clustercheck https://src.fedoraproject.org/rpms/mariadb/raw/10.3/f/clustercheck.sh \
-    && chmod 755 /usr/bin/clustercheck
-{% endif %}
-
 {% block mariadb_clustercheck_footer %}{% endblock %}
 {% block footer %}{% endblock %}