Continued from https://gerrit.hackerspace.pl/c/hscloud/+/73 . Change-Id: Ie761c2af588e06739de94fa1eff4f715d1f9b145