Move some tasks to main so they always run
More CAT II tasks