diff --git a/modules/aws/init.zsh b/modules/aws/init.zsh
index 13ba8dd..6dc2209 100644
--- a/modules/aws/init.zsh
+++ b/modules/aws/init.zsh
@@ -32,7 +32,7 @@ function aws_i {
 function aws_ebs {
     local profile=$(_get_aws_profile)
     aws ec2 describe-volumes --profile $profile --output ${_aws_output} \
-        --query 'Volumes[*].{id:VolumeId,tag:Tags[0].Value,at:Attachments[0].InstanceId,size:Size,AZ:AvailabilityZone}'
+        --query 'Volumes[].[Tags[?Key==`Name`] | [0].Value, VolumeId, Attachments[0].InstanceId, Size, AvailabilityZone]'
 }
 
 function aws_elb {