diff --git a/tasks/galera_upgrade.yml b/tasks/galera_upgrade.yml
index 38e3419a..69222a6e 100644
--- a/tasks/galera_upgrade.yml
+++ b/tasks/galera_upgrade.yml
@@ -17,8 +17,8 @@
 #                  version. If it is not assume it's nothing is installed.
 - name: Check mysql version
   shell: >
-    if which mysqladmin; then
-      mysqladmin --version | grep -w "{{ galera_major_version }}"
+    if which mysql; then
+      mysql -e "SHOW VARIABLES LIKE 'version';" --batch --skip-column-names | grep -w "{{ galera_major_version }}"
     fi
   register: mysqladmin_version
   changed_when: false
diff --git a/tasks/main.yml b/tasks/main.yml
index f4ec05ac..22a66e9c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -83,6 +83,7 @@
     - always
 
 - include_tasks: galera_upgrade.yml
+  when: galera_deployed | bool
   tags:
     - galera_server-upgrade