Rename "puavo"-image to "desktop", and "opinsys"-image is now
"opinsysdesktop".