bot: rework

Change-Id: Id4a43648c1903f7dcb413721acee6ef307411b02