Can the update to using `Makefile` now move in a separate PR?