diff --git a/mariadb/Dockerfile.ubuntu_bionic b/mariadb/Dockerfile.ubuntu_bionic
new file mode 100644
index 00000000..0b61e0fa
--- /dev/null
+++ b/mariadb/Dockerfile.ubuntu_bionic
@@ -0,0 +1,24 @@
+# mariadb:10.5.3-bionic
+ARG FROM=docker.io/mariadb@sha256:bd5b3470601aa4a28132ec60a8b1c33516d09a1391864fe1dbf82a4030397fd1
+FROM ${FROM}
+
+RUN set -ex ;\
+    apt-get update ;\
+    apt-get install -y --no-install-recommends \
+        python3-pip ;\
+    pip3 --no-cache-dir install --upgrade pip ;\
+    hash -r ;\
+    pip3 --no-cache-dir install --upgrade setuptools ;\
+    pip3 --no-cache-dir install --upgrade \
+      configparser \
+      iso8601 \
+      kubernetes \
+      pykube-ng ;\
+    apt-get clean -y ;\
+    rm -rf \
+       /var/cache/debconf/* \
+       /var/lib/apt/lists/* \
+       /var/log/* \
+       /tmp/* \
+       /var/tmp/* ;\
+    usermod -s /bin/false mysql
diff --git a/mariadb/build.sh b/mariadb/build.sh
index 0eb743ec..9ebbfb64 100755
--- a/mariadb/build.sh
+++ b/mariadb/build.sh
@@ -5,8 +5,8 @@ SCRIPT_DIR=`dirname ${SCRIPT}`
 cd ${SCRIPT_DIR}/..
 
 IMAGE="mariadb"
-VERSION=${VERSION:-latest}
-DISTRO=${DISTRO:-ubuntu_xenial}
+VERSION=${VERSION:-10.5.3-bionic}
+DISTRO=${DISTRO:-ubuntu_bionic}
 REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"}
 EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""}
 docker build -f ${IMAGE}/Dockerfile.${DISTRO} --network=host -t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} ${extra_build_args} ${IMAGE}