diff --git a/cmd/spinifex/cmd/admin_upgrade.go b/cmd/spinifex/cmd/admin_upgrade.go
index 06094f3e5..559e322c7 100644
--- a/cmd/spinifex/cmd/admin_upgrade.go
+++ b/cmd/spinifex/cmd/admin_upgrade.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/mulgadc/spinifex/spinifex/migrate"
-	"github.com/mulgadc/spinifex/spinifex/systemd"
+	"github.com/mulgadc/spinifex/spinifex/operator/host/systemd"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/spinifex/cmd/admin_upgrade_test.go b/cmd/spinifex/cmd/admin_upgrade_test.go
index 5fe41d01b..1e6689121 100644
--- a/cmd/spinifex/cmd/admin_upgrade_test.go
+++ b/cmd/spinifex/cmd/admin_upgrade_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/mulgadc/spinifex/spinifex/migrate"
-	"github.com/mulgadc/spinifex/spinifex/systemd"
+	"github.com/mulgadc/spinifex/spinifex/operator/host/systemd"
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/spinifex/bootstrap/preflight/services.go b/spinifex/bootstrap/preflight/services.go
index 884ae281c..ce8aa1af2 100644
--- a/spinifex/bootstrap/preflight/services.go
+++ b/spinifex/bootstrap/preflight/services.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/mulgadc/spinifex/spinifex/systemd"
+	"github.com/mulgadc/spinifex/spinifex/operator/host/systemd"
 )
 
 // deletedSuffix is what the kernel appends to /proc/<pid>/exe once the
diff --git a/spinifex/systemd/generate.go b/spinifex/operator/host/systemd/generate.go
similarity index 95%
rename from spinifex/systemd/generate.go
rename to spinifex/operator/host/systemd/generate.go
index 9d850dc04..3f0946031 100644
--- a/spinifex/systemd/generate.go
+++ b/spinifex/operator/host/systemd/generate.go
@@ -26,7 +26,7 @@ func run() error {
 	if err != nil {
 		return err
 	}
-	unitsDir := filepath.Join(selfDir, "..", "..", "build", "systemd")
+	unitsDir := filepath.Join(selfDir, "..", "..", "..", "..", "build", "systemd")
 
 	ents, err := os.ReadDir(unitsDir)
 	if err != nil {
diff --git a/spinifex/systemd/reconcile.go b/spinifex/operator/host/systemd/reconcile.go
similarity index 100%
rename from spinifex/systemd/reconcile.go
rename to spinifex/operator/host/systemd/reconcile.go
diff --git a/spinifex/systemd/reconcile_test.go b/spinifex/operator/host/systemd/reconcile_test.go
similarity index 100%
rename from spinifex/systemd/reconcile_test.go
rename to spinifex/operator/host/systemd/reconcile_test.go
diff --git a/spinifex/systemd/units_gen.go b/spinifex/operator/host/systemd/units_gen.go
similarity index 100%
rename from spinifex/systemd/units_gen.go
rename to spinifex/operator/host/systemd/units_gen.go
diff --git a/spinifex/systemd/units_invariants_test.go b/spinifex/operator/host/systemd/units_invariants_test.go
similarity index 100%
rename from spinifex/systemd/units_invariants_test.go
rename to spinifex/operator/host/systemd/units_invariants_test.go