diff --git a/Cargo.lock b/Cargo.lock
index d17fac18..93773ce3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1094,6 +1094,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
 [[package]]
 name = "cgroups-rs"
 version = "0.3.4"
@@ -1207,9 +1213,9 @@ dependencies = [
 
 [[package]]
 name = "command-fds"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f190f3c954f7bca3c6296d0ec561c739bdbe6c7e990294ed168d415f6e1b5b01"
+checksum = "7bb11bd1378bf3731b182997b40cefe00aba6a6cc74042c8318c1b271d3badf7"
 dependencies = [
  "nix 0.27.1",
  "thiserror",
@@ -1258,9 +1264,8 @@ dependencies = [
 
 [[package]]
 name = "containerd-shim"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063d0e137d508846210c2f8b6c6dc3db9f1abd4c20b0a9aecdb962385dcb7899"
+version = "0.7.0"
+source = "git+https://github.com/Mossaka/rust-extensions-fork?branch=rewrite_get_cgroups#61e33b00025e646e5f523f73f88735c4a2d8f55a"
 dependencies = [
  "cgroups-rs",
  "command-fds",
@@ -1270,7 +1275,7 @@ dependencies = [
  "libc",
  "log",
  "mio",
- "nix 0.27.1",
+ "nix 0.28.0",
  "oci-spec",
  "os_pipe",
  "page_size",
@@ -1280,14 +1285,13 @@ dependencies = [
  "signal-hook",
  "thiserror",
  "time",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "containerd-shim-protos"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "967dbd2804aceb398bd7d867410342d68b9d74c1fead823ad8353b3ab5f23eb7"
+version = "0.7.0"
+source = "git+https://github.com/Mossaka/rust-extensions-fork?branch=rewrite_get_cgroups#61e33b00025e646e5f523f73f88735c4a2d8f55a"
 dependencies = [
  "protobuf 3.2.0",
  "ttrpc",
@@ -1344,7 +1348,7 @@ dependencies = [
 [[package]]
 name = "containerd-shim-wasm"
 version = "0.5.0"
-source = "git+https://github.com/containerd/runwasi?rev=064baf38c7b7de64c253a50115b3f7e921f28817#064baf38c7b7de64c253a50115b3f7e921f28817"
+source = "git+https://github.com/kate-goldenring/runwasi?branch=cgroups-patch#322ee64b9b972bfa9c9ce57f3383ee2839908a2e"
 dependencies = [
  "anyhow",
  "caps",
@@ -3839,6 +3843,19 @@ dependencies = [
  "memoffset 0.9.0",
 ]
 
+[[package]]
+name = "nix"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+dependencies = [
+ "bitflags 2.4.2",
+ "cfg-if 1.0.0",
+ "cfg_aliases",
+ "libc",
+ "memoffset 0.9.0",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -4508,7 +4525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52"
 dependencies = [
  "libc",
- "nix 0.27.1",
+ "nix 0.28.0",
 ]
 
 [[package]]
diff --git a/containerd-shim-spin/Cargo.toml b/containerd-shim-spin/Cargo.toml
index b163bf4c..ca953d44 100644
--- a/containerd-shim-spin/Cargo.toml
+++ b/containerd-shim-spin/Cargo.toml
@@ -11,8 +11,8 @@ Containerd shim for running Spin workloads.
 """
 
 [dependencies]
-containerd-shim-wasm = { git = "https://github.com/containerd/runwasi", rev = "064baf38c7b7de64c253a50115b3f7e921f28817" }
-containerd-shim = "0.6.0"
+containerd-shim-wasm = { git = "https://github.com/kate-goldenring/runwasi", branch = "cgroups-patch" }
+containerd-shim = { git = "https://github.com/Mossaka/rust-extensions-fork", branch = "rewrite_get_cgroups" }
 log = "0.4"
 spin-app = { git = "https://github.com/fermyon/spin", tag = "v2.3.1" }
 spin-core = { git = "https://github.com/fermyon/spin", tag = "v2.3.1" }