Continued from https://gerrit.hackerspace.pl/c/hscloud/+/71 . Change-Id: I5aef587c7e9a4cec301e3c95530c33914851ad44