Clean up the volumes recipe a bit with regards to EC2 and device labels