Makefile container name changes

Nathan Hertzrequested to merge
change-container-names-in-makefile-1 into main

Last MR was messed up on several different layers of reality

Merge request reports