diff --git a/local/patches/base/P0-bootstrap-workspace-exclude.patch b/local/patches/base/P0-bootstrap-workspace-exclude.patch
new file mode 100644
index 0000000000..ae9fc381d9
--- /dev/null
+++ b/local/patches/base/P0-bootstrap-workspace-exclude.patch
@@ -0,0 +1,41 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 9e776232..b0fc8ec0 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -1,5 +1,6 @@
+ [workspace]
+ resolver = "2"
++exclude = ["bootstrap"]
+ members = [
+     "audiod",
+     "config",
+@@ -44,6 +45,21 @@ members = [
+ 
+     "drivers/input/ps2d",
+     "drivers/input/usbhidd",
++    "drivers/input/i2c-hidd",
++    "drivers/input/intel-thc-hidd",
++
++    "drivers/i2c/i2c-interface",
++    "drivers/i2c/i2cd",
++    "drivers/i2c/amd-mp2-i2cd",
++    "drivers/i2c/dw-acpi-i2cd",
++    "drivers/i2c/intel-lpss-i2cd",
++    "drivers/gpio/gpiod",
++    "drivers/gpio/intel-gpiod",
++    "drivers/gpio/i2c-gpio-expanderd",
++
++    "drivers/acpi-resource",
++    "drivers/amlserde",
++    "drivers/thermald",
+ 
+     "drivers/net/driver-network",
+     "drivers/net/e1000d",
+@@ -66,6 +82,7 @@ members = [
+     "drivers/usb/xhcid",
+     "drivers/usb/usbctl",
+     "drivers/usb/usbhubd",
++    "drivers/usb/ucsid",
+ ]
+ 
+ # Bootstrap needs it's own profile configuration
diff --git a/local/patches/base/P0-bootstrap-workspace-fix.patch b/local/patches/base/P0-bootstrap-workspace-fix.patch
new file mode 100644
index 0000000000..803d9d3bd9
--- /dev/null
+++ b/local/patches/base/P0-bootstrap-workspace-fix.patch
@@ -0,0 +1,21 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -2,6 +2,7 @@
+ resolver = "2"
++exclude = ["bootstrap"]
+ members = [
+     "audiod",
+-    "bootstrap",
+     "config",
+     "daemon",
+--- a/bootstrap/Cargo.toml
++++ b/bootstrap/Cargo.toml
+@@ -6,6 +6,8 @@
+ edition = "2024"
+ license = "MIT"
+ 
++[workspace]
++
+ [dependencies]
+ hashbrown = { version = "0.15", default-features = false, features = [
+     "inline-more",
diff --git a/local/patches/base/P0-bootstrap-workspace-standalone.patch b/local/patches/base/P0-bootstrap-workspace-standalone.patch
new file mode 100644
index 0000000000..1e9cd486fd
--- /dev/null
+++ b/local/patches/base/P0-bootstrap-workspace-standalone.patch
@@ -0,0 +1,11 @@
+--- a/bootstrap/Cargo.toml
++++ b/bootstrap/Cargo.toml
+@@ -6,6 +6,8 @@
+ edition = "2024"
+ license = "MIT"
+ 
++[workspace]
++
+ [dependencies]
+ hashbrown = { version = "0.15", default-features = false, features = [
+     "inline-more",
diff --git a/local/patches/base/P0-workspace-add-bootstrap.patch b/local/patches/base/P0-workspace-add-bootstrap.patch
deleted file mode 100644
index 907d94599d..0000000000
--- a/local/patches/base/P0-workspace-add-bootstrap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 9e776232..acdb1c97 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -2,6 +2,7 @@
- resolver = "2"
- members = [
-     "audiod",
-+    "bootstrap",
-     "config",
-     "daemon",
-     "dhcpd",
diff --git a/recipes/core/base/P0-workspace-add-bootstrap.patch b/recipes/core/base/P0-workspace-add-bootstrap.patch
deleted file mode 120000
index 7f0441ad17..0000000000
--- a/recipes/core/base/P0-workspace-add-bootstrap.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../../local/patches/base/P0-workspace-add-bootstrap.patch
\ No newline at end of file
diff --git a/recipes/core/base/recipe.toml b/recipes/core/base/recipe.toml
index 749252c4c3..2169b2014e 100644
--- a/recipes/core/base/recipe.toml
+++ b/recipes/core/base/recipe.toml
@@ -4,7 +4,8 @@ rev = "463f76b9608a896e6f6c9f63457f57f6409873c7"
 patches = [
     "P0-daemon-schemedaemon-option-unwrap.patch",
     "P0-redox-scheme-bump-0.11.1.patch",
-    "P0-workspace-add-bootstrap.patch",
+    "P0-bootstrap-workspace-exclude.patch",
+    "P0-bootstrap-workspace-standalone.patch",
     "P0-init-continuous-scheduling.patch",
     "P0-dhcpd-auto-iface.patch",
     "P0-procmgr-sigchld-debug.patch",