Rework selection code

1 job for master in 6 minutes and 23 seconds (queued for 1 second)
Status Job ID Name Coverage
  Flatpak
passed #150283
flatpak

00:06:23