[Dev-Host] Improve patterns a bit