Make the setup to work for QA

Make the setup to work for QA