diff --git a/container/container.go b/container/container.go
index 0d469b3..b50a43f 100644
--- a/container/container.go
+++ b/container/container.go
@@ -66,6 +66,10 @@ func Images() (diis []Image, err error) {
 	return
 }
 
+func ImagePath(sk config.KernelMask) string {
+	return config.Dir("containers", sk.DistroType.String(), sk.DistroRelease)
+}
+
 type Container struct {
 	name string
 
diff --git a/kernel/kernel.go b/kernel/kernel.go
index aa4753c..155f7fd 100644
--- a/kernel/kernel.go
+++ b/kernel/kernel.go
@@ -110,17 +110,6 @@ func MatchPackages(km config.KernelMask) (pkgs []string, err error) {
 	return
 }
 
-func dockerImagePath(sk config.KernelMask) (path string, err error) {
-	usr, err := user.Current()
-	if err != nil {
-		return
-	}
-
-	path = usr.HomeDir + "/.out-of-tree/containers/"
-	path += sk.DistroType.String() + "/" + sk.DistroRelease
-	return
-}
-
 func vsyscallAvailable() (available bool, err error) {
 	if runtime.GOOS != "linux" {
 		// Docker for non-Linux systems is not using the host
@@ -142,10 +131,7 @@ func vsyscallAvailable() (available bool, err error) {
 func GenerateBaseDockerImage(registry string, commands []config.DockerCommand,
 	sk config.KernelMask, forceUpdate bool) (err error) {
 
-	imagePath, err := dockerImagePath(sk)
-	if err != nil {
-		return
-	}
+	imagePath := container.ImagePath(sk)
 	dockerPath := imagePath + "/Dockerfile"
 
 	d := "# BASE\n"