diff --git a/mariadb-cluster/Chart.yaml b/mariadb-cluster/Chart.yaml
index 222bb5620..aadfc0e13 100644
--- a/mariadb-cluster/Chart.yaml
+++ b/mariadb-cluster/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v10.6.14
 description: OpenStack-Helm MariaDB controlled by mariadb-operator
 name: mariadb-cluster
-version: 0.0.1
+version: 0.0.2
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:
diff --git a/mariadb-cluster/templates/mariadb.yaml b/mariadb-cluster/templates/mariadb.yaml
index 82b9d11b5..ad030b570 100644
--- a/mariadb-cluster/templates/mariadb.yaml
+++ b/mariadb-cluster/templates/mariadb.yaml
@@ -176,9 +176,16 @@ spec:
           key: MYSQL_DBADMIN_PASSWORD
     - name: MYSQL_HISTFILE
       value: {{ .Values.conf.database.mysql_histfile }}
-
+{{ if  .Values.conf.database.auto_upgrade.enabled }}
+    - name: MARIADB_AUTO_UPGRADE
+      value: {{ .Values.conf.database.auto_upgrade.enabled | quote }}
+    - name: MARIADB_DISABLE_UPGRADE_BACKUP
+      value: {{ .Values.conf.database.auto_upgrade.disable_upgrade_backup | quote }}
+{{ end }}
 
   volumeMounts:
+    - name: pod-tmp
+      mountPath: /tmp
     - name: mariadb-secrets
       mountPath: /etc/mysql/admin_user.cnf
       subPath: admin_user.cnf
@@ -197,6 +204,8 @@ spec:
 {{ dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.secrets.tls.oslo_db.server.internal "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 4 }}
 
   volumes:
+    - name: pod-tmp
+      emptyDir: {}
     - name: mariadb-bin
       configMap:
         name: mariadb-bin
@@ -209,8 +218,6 @@ spec:
       secret:
         secretName: mariadb-secrets
         defaultMode: 0444
-    - name: pod-tmp
-      emptyDir: {}
 {{ dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.secrets.tls.oslo_db.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 4 }}
 
   # storage volume templates
diff --git a/mariadb-cluster/values.yaml b/mariadb-cluster/values.yaml
index 170ab9987..075f5c420 100644
--- a/mariadb-cluster/values.yaml
+++ b/mariadb-cluster/values.yaml
@@ -22,12 +22,12 @@ images:
   tags:
     agent: ghcr.io/mariadb-operator/agent:v0.0.3
     initContainer: ghcr.io/mariadb-operator/init:v0.0.6
-    mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
+    mariadb: docker.io/library/mariadb:10.6.14-focal
     prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.12.1
     prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/library/docker:17.07.0
-    scripted_test: docker.io/openstackhelm/mariadb:ubuntu_focal-20210415
+    scripted_test: docker.io/library/mariadb:10.6.14-focal
     mariadb_cluster_refresh_statefulset: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal
   pull_policy: "IfNotPresent"
   local_registry:
@@ -239,6 +239,9 @@ conf:
       iteration: 30
       duration: 5
   database:
+    auto_upgrade:
+      enabled: true
+      disable_upgrade_backup: false
     mysql_histfile: "/dev/null"
     init_script: |
       #!/usr/bin/env bash
diff --git a/releasenotes/notes/mariadb-cluster.yaml b/releasenotes/notes/mariadb-cluster.yaml
index 0588f8eea..fac57aeca 100644
--- a/releasenotes/notes/mariadb-cluster.yaml
+++ b/releasenotes/notes/mariadb-cluster.yaml
@@ -1,4 +1,5 @@
 ---
 mariadb-cluster:
   - 0.0.1 Initial Chart
+  - 0.0.2 Enable auto-upgrade
 ...