Fix script and always build credentials