diff --git a/Cargo.lock b/Cargo.lock
index ce04bb0d76..f994a73c23 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -673,7 +673,7 @@ dependencies = [
  "ab-proof-of-space",
  "anyhow",
  "async-lock",
- "cargo-gpu",
+ "cargo-gpu-install",
  "chacha20 0.10.0-rc.5",
  "derive_more 2.1.0",
  "futures",
@@ -1529,23 +1529,15 @@ dependencies = [
 ]
 
 [[package]]
-name = "cargo-gpu"
+name = "cargo-gpu-install"
 version = "0.1.0"
-source = "git+https://github.com/Rust-GPU/cargo-gpu?rev=5926363c2d4484ea0c30e4186ea71db70c01c04c#5926363c2d4484ea0c30e4186ea71db70c01c04c"
+source = "git+https://github.com/Rust-GPU/cargo-gpu?rev=70160693564611ca85e17a3c441da93ee642d29a#70160693564611ca85e17a3c441da93ee642d29a"
 dependencies = [
  "anyhow",
  "cargo_metadata",
- "clap",
- "crossterm",
  "directories",
- "dunce",
- "env_logger",
  "log",
- "relative-path",
- "rustc_codegen_spirv-target-specs",
- "semver",
  "serde",
- "serde_json",
  "spirv-builder",
 ]
 
@@ -1974,33 +1966,6 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
-[[package]]
-name = "crossterm"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
-dependencies = [
- "bitflags 2.10.0",
- "crossterm_winapi",
- "derive_more 2.1.0",
- "document-features",
- "mio",
- "parking_lot 0.12.5",
- "rustix",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "crunchy"
 version = "0.2.4"
@@ -2235,12 +2200,6 @@ version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04"
 
-[[package]]
-name = "dunce"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
-
 [[package]]
 name = "ed25519"
 version = "2.2.3"
@@ -2318,29 +2277,6 @@ dependencies = [
  "syn 2.0.111",
 ]
 
-[[package]]
-name = "env_filter"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bf3c259d255ca70051b30e2e95b5446cdb8949ac4cd22c0d7fd634d89f568e2"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "jiff",
- "log",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -2536,15 +2472,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "fsevent-sys"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -3291,26 +3218,6 @@ dependencies = [
  "hashbrown 0.16.1",
 ]
 
-[[package]]
-name = "inotify"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
-dependencies = [
- "bitflags 2.10.0",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify-sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "inout"
 version = "0.1.4"
@@ -3377,30 +3284,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
-[[package]]
-name = "jiff"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49cce2b81f2098e7e3efc35bc2e0a6b7abec9d34128283d7a26fa8f32a6dbb35"
-dependencies = [
- "jiff-static",
- "log",
- "portable-atomic",
- "portable-atomic-util",
- "serde_core",
-]
-
-[[package]]
-name = "jiff-static"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "980af8b43c3ad5d8d349ace167ec8170839f753a42d233ba19e08afe1850fa69"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.111",
-]
-
 [[package]]
 name = "jni"
 version = "0.21.1"
@@ -3573,26 +3456,6 @@ dependencies = [
  "cpufeatures",
 ]
 
-[[package]]
-name = "kqueue"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
-dependencies = [
- "kqueue-sys",
- "libc",
-]
-
-[[package]]
-name = "kqueue-sys"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
-]
-
 [[package]]
 name = "kv-log-macro"
 version = "1.0.7"
@@ -4291,7 +4154,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
 dependencies = [
  "libc",
- "log",
  "wasi",
  "windows-sys 0.61.2",
 ]
@@ -4497,30 +4359,6 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "notify"
-version = "8.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
-dependencies = [
- "bitflags 2.10.0",
- "fsevent-sys",
- "inotify",
- "kqueue",
- "libc",
- "log",
- "mio",
- "notify-types",
- "walkdir",
- "windows-sys 0.60.2",
-]
-
-[[package]]
-name = "notify-types"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
-
 [[package]]
 name = "nu-ansi-term"
 version = "0.50.3"
@@ -5328,15 +5166,6 @@ version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
-[[package]]
-name = "relative-path"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca40a312222d8ba74837cb474edef44b37f561da5f773981007a10bbaa992b0"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "renderdoc-sys"
 version = "1.1.0"
@@ -5431,21 +5260,17 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
-[[package]]
-name = "rustc_codegen_spirv-target-specs"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c89eaf493b3dfc730cda42a77014aad65e03213992c7afe0dff60a9f7d3dd94"
-
 [[package]]
 name = "rustc_codegen_spirv-types"
 version = "0.9.0"
-source = "git+https://github.com/Rust-GPU/rust-gpu?rev=e97524f6b4816056b3edaa70c3e0e0c656392c05#e97524f6b4816056b3edaa70c3e0e0c656392c05"
+source = "git+https://github.com/Rust-GPU/rust-gpu?rev=a30bd43db45f2bfe260051f44141e5eaffcbb4b0#a30bd43db45f2bfe260051f44141e5eaffcbb4b0"
 dependencies = [
  "rspirv",
+ "semver",
  "serde",
  "serde_json",
  "spirv",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -5914,27 +5739,6 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
-[[package]]
-name = "signal-hook"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc"
-dependencies = [
- "libc",
- "mio",
- "signal-hook",
-]
-
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.7"
@@ -6073,13 +5877,11 @@ dependencies = [
 [[package]]
 name = "spirv-builder"
 version = "0.9.0"
-source = "git+https://github.com/Rust-GPU/rust-gpu?rev=e97524f6b4816056b3edaa70c3e0e0c656392c05#e97524f6b4816056b3edaa70c3e0e0c656392c05"
+source = "git+https://github.com/Rust-GPU/rust-gpu?rev=a30bd43db45f2bfe260051f44141e5eaffcbb4b0#a30bd43db45f2bfe260051f44141e5eaffcbb4b0"
 dependencies = [
  "cargo_metadata",
- "clap",
  "log",
  "memchr",
- "notify",
  "raw-string",
  "rustc_codegen_spirv-types",
  "semver",
@@ -6091,7 +5893,7 @@ dependencies = [
 [[package]]
 name = "spirv-std"
 version = "0.9.0"
-source = "git+https://github.com/Rust-GPU/rust-gpu?rev=5719b273fd1fa8207e6e4537fed8c1f8175d4cc8#5719b273fd1fa8207e6e4537fed8c1f8175d4cc8"
+source = "git+https://github.com/Rust-GPU/rust-gpu?rev=a30bd43db45f2bfe260051f44141e5eaffcbb4b0#a30bd43db45f2bfe260051f44141e5eaffcbb4b0"
 dependencies = [
  "bitflags 1.3.2",
  "glam",
@@ -6104,7 +5906,7 @@ dependencies = [
 [[package]]
 name = "spirv-std-macros"
 version = "0.9.0"
-source = "git+https://github.com/Rust-GPU/rust-gpu?rev=5719b273fd1fa8207e6e4537fed8c1f8175d4cc8#5719b273fd1fa8207e6e4537fed8c1f8175d4cc8"
+source = "git+https://github.com/Rust-GPU/rust-gpu?rev=a30bd43db45f2bfe260051f44141e5eaffcbb4b0#a30bd43db45f2bfe260051f44141e5eaffcbb4b0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6115,7 +5917,7 @@ dependencies = [
 [[package]]
 name = "spirv-std-types"
 version = "0.9.0"
-source = "git+https://github.com/Rust-GPU/rust-gpu?rev=5719b273fd1fa8207e6e4537fed8c1f8175d4cc8#5719b273fd1fa8207e6e4537fed8c1f8175d4cc8"
+source = "git+https://github.com/Rust-GPU/rust-gpu?rev=a30bd43db45f2bfe260051f44141e5eaffcbb4b0#a30bd43db45f2bfe260051f44141e5eaffcbb4b0"
 
 [[package]]
 name = "spki"
diff --git a/Cargo.toml b/Cargo.toml
index 34d71cda99..18ca26744f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -64,7 +64,7 @@ bech32 = { version = "0.11.1", default-features = false }
 blake3 = { version = "1.8.2", default-features = false }
 bytes = { version = "1.11.0", default-features = false }
 bytesize = { version = "2.3.1", default-features = false }
-cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "5926363c2d4484ea0c30e4186ea71db70c01c04c", default-features = false }
+cargo-gpu-install = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "70160693564611ca85e17a3c441da93ee642d29a", default-features = false }
 chacha20 = { version = "0.10.0-rc.5", default-features = false }
 clap = { version = "4.5.53", features = ["derive"] }
 const_format = "0.2.35"
@@ -122,7 +122,7 @@ serde_json = "1.0.145"
 serde-big-array = "0.5.1"
 sha2 = { version = "0.11.0-rc.3", default-features = false }
 smallvec = { version = "1.15.1", features = ["union"] }
-spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "5719b273fd1fa8207e6e4537fed8c1f8175d4cc8" }
+spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "a30bd43db45f2bfe260051f44141e5eaffcbb4b0" }
 stable_deref_trait = { version = "1.2.1", default-features = false }
 strum = { version = "0.27.2", default-features = false, features = ["derive"] }
 syn = "2.0.111"
diff --git a/crates/farmer/ab-proof-of-space-gpu/Cargo.toml b/crates/farmer/ab-proof-of-space-gpu/Cargo.toml
index 0f976a7f04..bf6423f477 100644
--- a/crates/farmer/ab-proof-of-space-gpu/Cargo.toml
+++ b/crates/farmer/ab-proof-of-space-gpu/Cargo.toml
@@ -44,7 +44,7 @@ rand = { workspace = true }
 
 # TODO: This will be built in the shader as well, figure out a way to avoid that
 [build-dependencies]
-cargo-gpu = { workspace = true }
+cargo-gpu-install = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/crates/farmer/ab-proof-of-space-gpu/build.rs b/crates/farmer/ab-proof-of-space-gpu/build.rs
index a5ae5136a9..85ff8f4179 100644
--- a/crates/farmer/ab-proof-of-space-gpu/build.rs
+++ b/crates/farmer/ab-proof-of-space-gpu/build.rs
@@ -1,4 +1,5 @@
-use cargo_gpu::spirv_builder::{Capability, MetadataPrintout, SpirvMetadata};
+use cargo_gpu_install::install::Install;
+use cargo_gpu_install::spirv_builder::{Capability, MetadataPrintout, SpirvMetadata};
 use std::error::Error;
 use std::path::PathBuf;
 use std::{env, fs};
@@ -27,7 +28,7 @@ fn main() -> Result<(), Box<dyn Error>> {
 
         let shader_crate = PathBuf::from(cargo_manifest_dir);
 
-        let backend = cargo_gpu::Install::from_shader_crate(shader_crate.clone()).run()?;
+        let backend = Install::from_shader_crate(shader_crate.clone()).run()?;
 
         // TODO: Workaround for https://github.com/Rust-GPU/rust-gpu/issues/461
         // SAFETY: Single-threaded