diff --git a/cmd/yolo/main.go b/cmd/yolo/main.go
index 3e380d3a..fa793957 100644
--- a/cmd/yolo/main.go
+++ b/cmd/yolo/main.go
@@ -1,4 +1,4 @@
-package main
+package main // import "berty.tech/yolo/cmd/yolo"
 
 import (
 	"context"
@@ -11,7 +11,7 @@ import (
 	"syscall"
 	"time"
 
-	"berty.tech/yolo"
+	yolo "berty.tech/yolo/v2"
 	"github.com/buildkite/go-buildkite/buildkite"
 	"github.com/cayleygraph/cayley"
 	"github.com/cayleygraph/cayley/graph"
diff --git a/pkg/plistgen/doc.go b/pkg/plistgen/doc.go
index 56db65d3..4f8fc265 100644
--- a/pkg/plistgen/doc.go
+++ b/pkg/plistgen/doc.go
@@ -1 +1 @@
-package plistgen // import "berty.tech/yolo/internal/plistgen"
+package plistgen // import "berty.tech/yolo/pkg/plistgen""
diff --git a/service.go b/service.go
index 6c288285..73a025c3 100644
--- a/service.go
+++ b/service.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"time"
 
-	"berty.tech/yolo/pkg/plistgen"
+	plistgen "berty.tech/yolo/v2/pkg/plistgen"
 	"github.com/buildkite/go-buildkite/buildkite"
 	"github.com/cayleygraph/cayley"
 	cayleypath "github.com/cayleygraph/cayley/graph/path"