Container hotfix