diff --git a/ansible/roles/glance/tasks/check.yml b/ansible/roles/glance/tasks/check.yml
index 6dab34da6a..d6651b2ad5 100644
--- a/ansible/roles/glance/tasks/check.yml
+++ b/ansible/roles/glance/tasks/check.yml
@@ -1,19 +1,22 @@
 ---
-- name: Glance sanity checks
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m kolla_sanity
-    -a "service=glance
-        project=service
-        user=admin
-        password={{ glance_keystone_password }}
-        role=admin
-        region_name={{ openstack_region_name }}
-        auth={{ '{{ openstack_glance_auth }}' }}"
-    -e "{'openstack_glance_auth':{{ openstack_glance_auth }}}"
-  register: glance_sanity
-  changed_when: "{{ glance_sanity.stdout.find('localhost | SUCCESS => ') != -1 and (glance_sanity.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  until: glance_sanity.stdout.split()[2] == 'SUCCESS'
-  retries: 10
-  delay: 5
+- name: Glance sanity check - create image
+  kolla_toolbox:
+    module_name: os_image
+    module_args:
+      auth: "{{ openstack_glance_auth }}"
+      name: "glance_sanity_check"
+      filename: "/etc/hostname"
+  delegate_to: "{{ groups['glance-api'][0] }}"
+  run_once: True
+  when: kolla_enable_sanity_glance | bool
+
+- name: Glance sanity check - cleanup
+  kolla_toolbox:
+    module_name: os_image
+    module_args:
+      auth: "{{ openstack_glance_auth }}"
+      name: "glance_sanity_check"
+      state: absent
+  delegate_to: "{{ groups['glance-api'][0] }}"
   run_once: True
   when: kolla_enable_sanity_glance | bool