Anthony Nandaa

@marosset @jsturtevant -- sorry I forgot about this PR and got a merge conflict. I have fixed now, kindly take a look.

This PR should be ready now. @AkihiroSuda -- you can help?

> Needs rebase to pass the CI Sorry, I'd missed that. Now fixed.

> Please remove "Merge branch" commits Fixed, sorry for oversight on my end.

@AkihiroSuda -- it's all good, just waiting your sign off, thx.

@estesp -- sure, I will. Still investigating something, once the PR is ready, I'll squash.

@AkihiroSuda @estesp -- pls take a look. Also while at it, decided to add a `curl` step for getting the `containerd.service` file to better the experience for those who could...

~PS. will fix the TOC issue...~ fixed

@crazy-max -- somehow I missed your comments when looking at the diff. Addressing them in a few.

> PTAL CI error as well Not sure what I'm missing for my `doctoc` validation, was running successfully locally.