Unify m7 builds