do the same here as what was done in lambda__admin