Revert "Revert "Switch to singapore""

This reverts commit b1093a37f2000af757ca164fbaecd5b5ef6f7433.