diff --git a/common/tasks/filesystem.py b/common/tasks/filesystem.py
index 37c37a8..81094d4 100644
--- a/common/tasks/filesystem.py
+++ b/common/tasks/filesystem.py
@@ -2,7 +2,7 @@ from base import Task
 from common import phases
 from common.exceptions import TaskError
 from common.tools import log_check_call
-from common.bootstrap import Bootstrap
+from bootstrap import Bootstrap
 
 
 class FormatVolume(Task):
diff --git a/common/tasks/parted.py b/common/tasks/parted.py
index 2797d39..1667d41 100644
--- a/common/tasks/parted.py
+++ b/common/tasks/parted.py
@@ -1,7 +1,7 @@
 from base import Task
 from common import phases
 from common.tools import log_check_call
-from common.tasks import UnmountVolume
+from filesystem import UnmountVolume
 
 
 class PartitionVolume(Task):
diff --git a/providers/virtualbox/__init__.py b/providers/virtualbox/__init__.py
index 9a9bfc6..ed5cb7f 100644
--- a/providers/virtualbox/__init__.py
+++ b/providers/virtualbox/__init__.py
@@ -1,7 +1,7 @@
 from manifest import Manifest
 from tasks import packages
 from common.tasks import packages as common_packages
-from tasks import host
+from common.tasks import host
 from common.tasks import loopback
 from common.tasks import parted
 from common.tasks import filesystem