diff --git a/tasks/cinder_qos.yml b/tasks/cinder_qos.yml
index 6b86e1bc..1ade8b8d 100644
--- a/tasks/cinder_qos.yml
+++ b/tasks/cinder_qos.yml
@@ -17,7 +17,7 @@
   shell: |
     . {{ ansible_env.HOME }}/openrc
     CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (cinder_service_internaluri_insecure | bool)) | ternary('--insecure','') }}"
-    {{ cinder_bin }}/cinder qos-list | grep {{ item.name }} || \
+    {{ cinder_bin }}/cinder qos-list | grep -x {{ item.name }} || \
     {{ cinder_bin }}/cinder qos-create {{ item.name }}\
     {% for k,v in item.options.items() %} {{ k }}={{ v }}{% endfor %}
   args:
@@ -33,8 +33,8 @@
     CLI_OPTIONS="{{ ((keystone_service_adminuri_insecure | bool) or (cinder_service_internaluri_insecure | bool)) | ternary('--insecure','') }}"
     {% for vtype in item.cinder_volume_types %}
     {{ cinder_bin }}/cinder qos-associate \
-      $({{ cinder_bin }}/cinder qos-list | grep {{ item.name }} | grep -oE "{{ _UUID_regex }}") \
-      $({{ cinder_bin }}/cinder type-list | grep {{ vtype }} | grep -oE "{{ _UUID_regex }}")
+      $({{ cinder_bin }}/cinder qos-list | grep -x {{ item.name }} | grep -oE "{{ _UUID_regex }}") \
+      $({{ cinder_bin }}/cinder type-list | grep -x {{ vtype }} | grep -oE "{{ _UUID_regex }}")
     {% endfor %}
   args:
     executable: /bin/bash