Adapt to xap-elastic recipe