diff --git a/cmd/spinifex/cmd/admin_preflight.go b/cmd/spinifex/cmd/admin_preflight.go
index 65b999fe2..10490525d 100644
--- a/cmd/spinifex/cmd/admin_preflight.go
+++ b/cmd/spinifex/cmd/admin_preflight.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"text/tabwriter"
 
-	"github.com/mulgadc/spinifex/spinifex/preflight"
+	"github.com/mulgadc/spinifex/spinifex/bootstrap/preflight"
 	"github.com/spf13/cobra"
 )
 
diff --git a/scripts/gen-asset-manifest.sh b/scripts/gen-asset-manifest.sh
index 4ee623714..665576c7d 100755
--- a/scripts/gen-asset-manifest.sh
+++ b/scripts/gen-asset-manifest.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # gen-asset-manifest.sh — extracts the canonical bytes of each managed asset
 # heredoc from the provisioning scripts, sha256s them, and (re)writes
-# spinifex/preflight/manifest_gen.go.
+# spinifex/bootstrap/preflight/manifest_gen.go.
 #
 # Run this after editing a managed heredoc in setup.sh or setup-ovn.sh.
 # manifest_gen_test.go re-extracts the same heredocs and fails if the
@@ -12,7 +12,7 @@ set -euo pipefail
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
-OUT="$ROOT/spinifex/preflight/manifest_gen.go"
+OUT="$ROOT/spinifex/bootstrap/preflight/manifest_gen.go"
 
 # extract_heredoc FILE ANCHOR
 # Prints the body of the first quoted 'HELPER' heredoc starting after the
diff --git a/spinifex/preflight/manifest_gen.go b/spinifex/bootstrap/preflight/manifest_gen.go
similarity index 100%
rename from spinifex/preflight/manifest_gen.go
rename to spinifex/bootstrap/preflight/manifest_gen.go
diff --git a/spinifex/preflight/manifest_gen_test.go b/spinifex/bootstrap/preflight/manifest_gen_test.go
similarity index 100%
rename from spinifex/preflight/manifest_gen_test.go
rename to spinifex/bootstrap/preflight/manifest_gen_test.go
diff --git a/spinifex/preflight/preflight.go b/spinifex/bootstrap/preflight/preflight.go
similarity index 98%
rename from spinifex/preflight/preflight.go
rename to spinifex/bootstrap/preflight/preflight.go
index cd393821e..18f51ed19 100644
--- a/spinifex/preflight/preflight.go
+++ b/spinifex/bootstrap/preflight/preflight.go
@@ -14,7 +14,7 @@ import (
 	"github.com/mulgadc/spinifex/spinifex/utils"
 )
 
-//go:generate ../../scripts/gen-asset-manifest.sh
+//go:generate ../../../scripts/gen-asset-manifest.sh
 
 // Status is the outcome of checking one managed asset against this build's manifest.
 type Status int
diff --git a/spinifex/preflight/preflight_test.go b/spinifex/bootstrap/preflight/preflight_test.go
similarity index 100%
rename from spinifex/preflight/preflight_test.go
rename to spinifex/bootstrap/preflight/preflight_test.go
diff --git a/spinifex/preflight/services.go b/spinifex/bootstrap/preflight/services.go
similarity index 100%
rename from spinifex/preflight/services.go
rename to spinifex/bootstrap/preflight/services.go
diff --git a/spinifex/preflight/services_test.go b/spinifex/bootstrap/preflight/services_test.go
similarity index 100%
rename from spinifex/preflight/services_test.go
rename to spinifex/bootstrap/preflight/services_test.go
diff --git a/spinifex/daemon/daemon.go b/spinifex/daemon/daemon.go
index a4965be22..eba7206e5 100644
--- a/spinifex/daemon/daemon.go
+++ b/spinifex/daemon/daemon.go
@@ -32,6 +32,7 @@ import (
 	"github.com/mulgadc/bluebottle/pkg/tlsconfig"
 	"github.com/mulgadc/spinifex/spinifex/admin"
 	"github.com/mulgadc/spinifex/spinifex/awserrors"
+	"github.com/mulgadc/spinifex/spinifex/bootstrap/preflight"
 	"github.com/mulgadc/spinifex/spinifex/config"
 	"github.com/mulgadc/spinifex/spinifex/ebsprovider"
 	"github.com/mulgadc/spinifex/spinifex/gpu"
@@ -69,7 +70,6 @@ import (
 	"github.com/mulgadc/spinifex/spinifex/network/host"
 	"github.com/mulgadc/spinifex/spinifex/objectstore"
 	"github.com/mulgadc/spinifex/spinifex/otelsetup"
-	"github.com/mulgadc/spinifex/spinifex/preflight"
 	"github.com/mulgadc/spinifex/spinifex/services/viperblockd/vbwire"
 	"github.com/mulgadc/spinifex/spinifex/types"
 	"github.com/mulgadc/spinifex/spinifex/utils"