diff --git a/internal/agent/agent.go b/internal/agent/agent.go
index b5c8ba8..fd2e1d3 100644
--- a/internal/agent/agent.go
+++ b/internal/agent/agent.go
@@ -5,14 +5,12 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/kairos-io/kairos/pkg/utils"
-
 	events "github.com/kairos-io/kairos-sdk/bus"
-
+	"github.com/kairos-io/kairos-sdk/machine"
+	"github.com/kairos-io/kairos-sdk/utils"
 	hook "github.com/kairos-io/kairos/internal/agent/hooks"
 	"github.com/kairos-io/kairos/internal/bus"
 	config "github.com/kairos-io/kairos/pkg/config"
-	machine "github.com/kairos-io/kairos/pkg/machine"
 	"github.com/nxadm/tail"
 )
 
diff --git a/internal/agent/hooks/bundles.go b/internal/agent/hooks/bundles.go
index c41154e..7ab3f66 100644
--- a/internal/agent/hooks/bundles.go
+++ b/internal/agent/hooks/bundles.go
@@ -2,8 +2,8 @@ package hook
 
 import (
 	"github.com/kairos-io/kairos-sdk/bundles"
+	"github.com/kairos-io/kairos-sdk/machine"
 	config "github.com/kairos-io/kairos/pkg/config"
-	"github.com/kairos-io/kairos/pkg/machine"
 )
 
 type BundleOption struct{}
diff --git a/internal/agent/hooks/kcrypt.go b/internal/agent/hooks/kcrypt.go
index 09cd97b..74978dc 100644
--- a/internal/agent/hooks/kcrypt.go
+++ b/internal/agent/hooks/kcrypt.go
@@ -5,9 +5,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/kairos-io/kairos-sdk/machine"
+	"github.com/kairos-io/kairos-sdk/utils"
 	config "github.com/kairos-io/kairos/pkg/config"
-	"github.com/kairos-io/kairos/pkg/machine"
-	"github.com/kairos-io/kairos/pkg/utils"
 
 	kcryptconfig "github.com/kairos-io/kcrypt/pkg/config"
 )
diff --git a/internal/agent/hooks/lifecycle.go b/internal/agent/hooks/lifecycle.go
index e1aa65a..2638a03 100644
--- a/internal/agent/hooks/lifecycle.go
+++ b/internal/agent/hooks/lifecycle.go
@@ -1,8 +1,8 @@
 package hook
 
 import (
-	config "github.com/kairos-io/kairos/pkg/config"
-	"github.com/kairos-io/kairos/pkg/utils"
+	"github.com/kairos-io/kairos-sdk/utils"
+	"github.com/kairos-io/kairos/pkg/config"
 )
 
 type Lifecycle struct{}
diff --git a/internal/agent/hooks/mounts.go b/internal/agent/hooks/mounts.go
index 30e2779..29e7775 100644
--- a/internal/agent/hooks/mounts.go
+++ b/internal/agent/hooks/mounts.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/kairos-io/kairos-sdk/machine"
 	config "github.com/kairos-io/kairos/pkg/config"
-	"github.com/kairos-io/kairos/pkg/machine"
 	"github.com/mudler/yip/pkg/schema"
 	yip "github.com/mudler/yip/pkg/schema"
 	"gopkg.in/yaml.v1"
diff --git a/internal/agent/hooks/runstage.go b/internal/agent/hooks/runstage.go
index 433f7a7..1686148 100644
--- a/internal/agent/hooks/runstage.go
+++ b/internal/agent/hooks/runstage.go
@@ -1,8 +1,8 @@
 package hook
 
 import (
+	"github.com/kairos-io/kairos-sdk/utils"
 	config "github.com/kairos-io/kairos/pkg/config"
-	"github.com/kairos-io/kairos/pkg/utils"
 
 	events "github.com/kairos-io/kairos-sdk/bus"
 )
diff --git a/internal/agent/install.go b/internal/agent/install.go
index fb74f27..92adf93 100644
--- a/internal/agent/install.go
+++ b/internal/agent/install.go
@@ -13,16 +13,12 @@ import (
 	"time"
 
 	events "github.com/kairos-io/kairos-sdk/bus"
-
-	config "github.com/kairos-io/kairos/pkg/config"
-
+	"github.com/kairos-io/kairos-sdk/machine"
+	"github.com/kairos-io/kairos-sdk/utils"
 	hook "github.com/kairos-io/kairos/internal/agent/hooks"
 	"github.com/kairos-io/kairos/internal/bus"
-
 	"github.com/kairos-io/kairos/internal/cmd"
-	"github.com/kairos-io/kairos/pkg/utils"
-
-	machine "github.com/kairos-io/kairos/pkg/machine"
+	config "github.com/kairos-io/kairos/pkg/config"
 	qr "github.com/mudler/go-nodepair/qrcode"
 	"github.com/mudler/go-pluggable"
 	"github.com/pterm/pterm"
diff --git a/internal/agent/interactive_install.go b/internal/agent/interactive_install.go
index fef4f4a..21babab 100644
--- a/internal/agent/interactive_install.go
+++ b/internal/agent/interactive_install.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/erikgeiser/promptkit/textinput"
 	"github.com/jaypipes/ghw"
-	"github.com/kairos-io/kairos/pkg/utils"
+	"github.com/kairos-io/kairos-sdk/utils"
 	"github.com/mudler/go-pluggable"
 	"github.com/mudler/yip/pkg/schema"
 	"github.com/pterm/pterm"
diff --git a/internal/agent/recovery.go b/internal/agent/recovery.go
index 28415a0..25e9d00 100644
--- a/internal/agent/recovery.go
+++ b/internal/agent/recovery.go
@@ -5,11 +5,10 @@ import (
 	"time"
 
 	events "github.com/kairos-io/kairos-sdk/bus"
+	"github.com/kairos-io/kairos-sdk/machine"
+	"github.com/kairos-io/kairos-sdk/utils"
 	"github.com/kairos-io/kairos/internal/bus"
 	"github.com/kairos-io/kairos/internal/cmd"
-	"github.com/kairos-io/kairos/pkg/utils"
-
-	machine "github.com/kairos-io/kairos/pkg/machine"
 	qr "github.com/mudler/go-nodepair/qrcode"
 	"github.com/mudler/go-pluggable"
 	"github.com/pterm/pterm"
diff --git a/internal/agent/reset.go b/internal/agent/reset.go
index f6552f3..a3278ac 100644
--- a/internal/agent/reset.go
+++ b/internal/agent/reset.go
@@ -9,12 +9,12 @@ import (
 	"time"
 
 	sdk "github.com/kairos-io/kairos-sdk/bus"
+	"github.com/kairos-io/kairos-sdk/machine"
+	"github.com/kairos-io/kairos-sdk/utils"
 	hook "github.com/kairos-io/kairos/internal/agent/hooks"
 	"github.com/kairos-io/kairos/internal/bus"
 	"github.com/kairos-io/kairos/internal/cmd"
 	"github.com/kairos-io/kairos/pkg/config"
-	"github.com/kairos-io/kairos/pkg/machine"
-	"github.com/kairos-io/kairos/pkg/utils"
 
 	"github.com/mudler/go-pluggable"
 	"github.com/pterm/pterm"
diff --git a/internal/agent/upgrade.go b/internal/agent/upgrade.go
index 78fe2b9..39f4564 100644
--- a/internal/agent/upgrade.go
+++ b/internal/agent/upgrade.go
@@ -11,9 +11,9 @@ import (
 	events "github.com/kairos-io/kairos-sdk/bus"
 	"github.com/kairos-io/kairos/pkg/config"
 
+	"github.com/kairos-io/kairos-sdk/utils"
 	"github.com/kairos-io/kairos/internal/bus"
 	"github.com/kairos-io/kairos/pkg/github"
-	"github.com/kairos-io/kairos/pkg/utils"
 	"github.com/mudler/go-pluggable"
 )
 
diff --git a/internal/cmd/utils.go b/internal/cmd/utils.go
index f345b53..07066df 100644
--- a/internal/cmd/utils.go
+++ b/internal/cmd/utils.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/kairos-io/kairos/internal/kairos"
 
-	"github.com/kairos-io/kairos/pkg/utils"
+	"github.com/kairos-io/kairos-sdk/utils"
 	"github.com/pterm/pterm"
 )