Hotfix/upgrade all samples