fix(metadata) Fix metadata storage for Amazon