Update custom scripts

Change-Id: 21f5c59575
Story-Id: unassigned
Update config

Story-Id: unassigned
Change-Id: c8053d88bf