diff --git a/ibm/mas_devops/roles/ocp_efs/tasks/efs-setup.yml b/ibm/mas_devops/roles/ocp_efs/tasks/efs-setup.yml
index 6c734ecca9..8903e42567 100644
--- a/ibm/mas_devops/roles/ocp_efs/tasks/efs-setup.yml
+++ b/ibm/mas_devops/roles/ocp_efs/tasks/efs-setup.yml
@@ -19,7 +19,7 @@
 
 - name: "efs-setup : Query to Filter the Cluster VPC Id from the list of VPCs"
   vars:
-    query: "Vpcs[?(Tags[?contains(Value,'{{ cluster_name }}' )])].VpcId"
+    query: "Vpcs[?(Tags[?contains(Value,'{{ cluster_name }}-' )])].VpcId"
   set_fact:
     vpcid: "{{ vpc_ids.stdout|from_json|json_query(query) }}"