Merge branch 'gc-containerize-fix' into 'master'

Merge request template

These changes will fix https://community.opengroup.org/osdu/platform/system/storage/-/jobs/1997071 in tagged pipelines