Update config

Story-Id: unassigned
Change-Id: c8053d88bf
Move to PT

Story-Id: unassigned
Change-Id: 3aaf1e8795