diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..6a714af
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/go-devops.iml" filepath="$PROJECT_DIR$/.idea/go-devops.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/cmd/deploy/cmd_ansible.go b/cmd/deploy/cmd_ansible.go
index a8e5b77..710deec 100644
--- a/cmd/deploy/cmd_ansible.go
+++ b/cmd/deploy/cmd_ansible.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"forge.lthn.ai/core/go-devops/ansible"
+	"forge.lthn.ai/core/go-ansible"
 	"forge.lthn.ai/core/cli/pkg/cli"
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/dev/cmd_vm.go b/cmd/dev/cmd_vm.go
index fc9195f..7fb002f 100644
--- a/cmd/dev/cmd_vm.go
+++ b/cmd/dev/cmd_vm.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"forge.lthn.ai/core/cli/pkg/cli"
-	"forge.lthn.ai/core/go-devops/devops"
+	"forge.lthn.ai/core/go-container/devenv"
 	"forge.lthn.ai/core/go-i18n"
 	"forge.lthn.ai/core/go-io"
 )
@@ -41,7 +41,7 @@ func addVMInstallCommand(parent *cli.Command) {
 }
 
 func runVMInstall() error {
-	d, err := devops.New(io.Local)
+	d, err := devenv.New(io.Local)
 	if err != nil {
 		return err
 	}
@@ -53,7 +53,7 @@ func runVMInstall() error {
 		return nil
 	}
 
-	cli.Print("%s %s\n", dimStyle.Render(i18n.Label("image")), devops.ImageName())
+	cli.Print("%s %s\n", dimStyle.Render(i18n.Label("image")), devenv.ImageName())
 	cli.Blank()
 	cli.Text(i18n.T("cmd.dev.vm.downloading"))
 	cli.Blank()
@@ -113,7 +113,7 @@ func addVMBootCommand(parent *cli.Command) {
 }
 
 func runVMBoot(memory, cpus int, fresh bool) error {
-	d, err := devops.New(io.Local)
+	d, err := devenv.New(io.Local)
 	if err != nil {
 		return err
 	}
@@ -122,7 +122,7 @@ func runVMBoot(memory, cpus int, fresh bool) error {
 		return errors.New(i18n.T("cmd.dev.vm.not_installed"))
 	}
 
-	opts := devops.DefaultBootOptions()
+	opts := devenv.DefaultBootOptions()
 	if memory > 0 {
 		opts.Memory = memory
 	}
@@ -164,7 +164,7 @@ func addVMStopCommand(parent *cli.Command) {
 }
 
 func runVMStop() error {
-	d, err := devops.New(io.Local)
+	d, err := devenv.New(io.Local)
 	if err != nil {
 		return err
 	}
@@ -205,7 +205,7 @@ func addVMStatusCommand(parent *cli.Command) {
 }
 
 func runVMStatus() error {
-	d, err := devops.New(io.Local)
+	d, err := devenv.New(io.Local)
 	if err != nil {
 		return err
 	}
@@ -284,12 +284,12 @@ func addVMShellCommand(parent *cli.Command) {
 }
 
 func runVMShell(console bool, command []string) error {
-	d, err := devops.New(io.Local)
+	d, err := devenv.New(io.Local)
 	if err != nil {
 		return err
 	}
 
-	opts := devops.ShellOptions{
+	opts := devenv.ShellOptions{
 		Console: console,
 		Command: command,
 	}
@@ -322,7 +322,7 @@ func addVMServeCommand(parent *cli.Command) {
 }
 
 func runVMServe(port int, path string) error {
-	d, err := devops.New(io.Local)
+	d, err := devenv.New(io.Local)
 	if err != nil {
 		return err
 	}
@@ -332,7 +332,7 @@ func runVMServe(port int, path string) error {
 		return err
 	}
 
-	opts := devops.ServeOptions{
+	opts := devenv.ServeOptions{
 		Port: port,
 		Path: path,
 	}
@@ -361,7 +361,7 @@ func addVMTestCommand(parent *cli.Command) {
 }
 
 func runVMTest(name string, command []string) error {
-	d, err := devops.New(io.Local)
+	d, err := devenv.New(io.Local)
 	if err != nil {
 		return err
 	}
@@ -371,7 +371,7 @@ func runVMTest(name string, command []string) error {
 		return err
 	}
 
-	opts := devops.TestOptions{
+	opts := devenv.TestOptions{
 		Name:    name,
 		Command: command,
 	}
@@ -406,7 +406,7 @@ func addVMClaudeCommand(parent *cli.Command) {
 }
 
 func runVMClaude(noAuth bool, model string, authFlags []string) error {
-	d, err := devops.New(io.Local)
+	d, err := devenv.New(io.Local)
 	if err != nil {
 		return err
 	}
@@ -416,7 +416,7 @@ func runVMClaude(noAuth bool, model string, authFlags []string) error {
 		return err
 	}
 
-	opts := devops.ClaudeOptions{
+	opts := devenv.ClaudeOptions{
 		NoAuth: noAuth,
 		Model:  model,
 		Auth:   authFlags,
@@ -446,7 +446,7 @@ func addVMUpdateCommand(parent *cli.Command) {
 }
 
 func runVMUpdate(apply bool) error {
-	d, err := devops.New(io.Local)
+	d, err := devenv.New(io.Local)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/prod/cmd_dns.go b/cmd/prod/cmd_dns.go
index 32d71a4..2bb15a7 100644
--- a/cmd/prod/cmd_dns.go
+++ b/cmd/prod/cmd_dns.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"forge.lthn.ai/core/cli/pkg/cli"
-	"forge.lthn.ai/core/go-devops/infra"
+	"forge.lthn.ai/core/go-infra"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/prod/cmd_lb.go b/cmd/prod/cmd_lb.go
index e9d169c..518ea5d 100644
--- a/cmd/prod/cmd_lb.go
+++ b/cmd/prod/cmd_lb.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"forge.lthn.ai/core/cli/pkg/cli"
-	"forge.lthn.ai/core/go-devops/infra"
+	"forge.lthn.ai/core/go-infra"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/prod/cmd_setup.go b/cmd/prod/cmd_setup.go
index 91a72b4..5ff3ad2 100644
--- a/cmd/prod/cmd_setup.go
+++ b/cmd/prod/cmd_setup.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"forge.lthn.ai/core/cli/pkg/cli"
-	"forge.lthn.ai/core/go-devops/infra"
+	"forge.lthn.ai/core/go-infra"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/prod/cmd_status.go b/cmd/prod/cmd_status.go
index f90ec78..63eff06 100644
--- a/cmd/prod/cmd_status.go
+++ b/cmd/prod/cmd_status.go
@@ -8,9 +8,9 @@ import (
 	"sync"
 	"time"
 
-	"forge.lthn.ai/core/go-devops/ansible"
+	"forge.lthn.ai/core/go-ansible"
 	"forge.lthn.ai/core/cli/pkg/cli"
-	"forge.lthn.ai/core/go-devops/infra"
+	"forge.lthn.ai/core/go-infra"
 	"github.com/spf13/cobra"
 )
 
diff --git a/cmd/vm/cmd_container.go b/cmd/vm/cmd_container.go
index 6071d89..464eb14 100644
--- a/cmd/vm/cmd_container.go
+++ b/cmd/vm/cmd_container.go
@@ -10,7 +10,7 @@ import (
 	"text/tabwriter"
 	"time"
 
-	"forge.lthn.ai/core/go-devops/container"
+	"forge.lthn.ai/core/go-container"
 	"forge.lthn.ai/core/go-i18n"
 	"forge.lthn.ai/core/go-io"
 	"github.com/spf13/cobra"
diff --git a/cmd/vm/cmd_templates.go b/cmd/vm/cmd_templates.go
index d4a0e79..2b220b3 100644
--- a/cmd/vm/cmd_templates.go
+++ b/cmd/vm/cmd_templates.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"text/tabwriter"
 
-	"forge.lthn.ai/core/go-devops/container"
+	"forge.lthn.ai/core/go-container"
 	"forge.lthn.ai/core/go-i18n"
 	"forge.lthn.ai/core/go-io"
 	"github.com/spf13/cobra"
diff --git a/go.mod b/go.mod
index 5e99b83..37495b1 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,10 @@ go 1.26.0
 require (
 	forge.lthn.ai/core/cli v0.1.0
 	forge.lthn.ai/core/go-agentic v0.1.0
+	forge.lthn.ai/core/go-ansible v0.1.0
 	forge.lthn.ai/core/go-config v0.1.0
+	forge.lthn.ai/core/go-container v0.1.0
+	forge.lthn.ai/core/go-infra v0.1.0
 	forge.lthn.ai/core/go-i18n v0.1.0
 	forge.lthn.ai/core/go-io v0.0.3
 	forge.lthn.ai/core/go-log v0.0.1