Make workspace setup a little bit more reliable

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>