Change to use storage UUID from filesystem