Refactor admin steps to use fabrication steps