Fixes #7986 - Save container UUID and display managed containers