diff --git a/Cargo.lock b/Cargo.lock
index 11927d5..faa21e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1016,7 +1016,7 @@ dependencies = [
  "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "itertools 0.13.0",
+ "itertools 0.10.5",
  "proc-macro2",
  "quote",
  "regex",
@@ -1577,7 +1577,7 @@ dependencies = [
  "spin-common",
  "spin-componentize",
  "spin-core",
- "spin-expressions",
+ "spin-expressions 3.1.1",
  "spin-factor-outbound-networking",
  "spin-factors",
  "spin-factors-executor",
@@ -2380,6 +2380,17 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5692dd7b5a1978a5aeb0ce83b7655c58ca8efdcb79d21036ea249da95afec2c6"
 
+[[package]]
+name = "etcetera"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
+dependencies = [
+ "cfg-if 1.0.0",
+ "home",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "event-listener"
 version = "2.5.3"
@@ -3111,7 +3122,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.10",
+ "socket2 0.5.8",
  "tokio",
  "tower-service",
  "tracing",
@@ -4082,6 +4093,15 @@ dependencies = [
  "rustix 0.38.42",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "memoffset"
 version = "0.7.1"
@@ -4173,12 +4193,6 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
-[[package]]
-name = "multimap"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
-
 [[package]]
 name = "mysql_async"
 version = "0.34.2"
@@ -4279,6 +4293,8 @@ dependencies = [
  "bitflags 1.3.2",
  "cfg-if 1.0.0",
  "libc",
+ "memoffset 0.6.5",
+ "pin-utils",
 ]
 
 [[package]]
@@ -5236,7 +5252,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52"
 dependencies = [
  "libc",
- "nix 0.29.0",
+ "nix 0.25.1",
 ]
 
 [[package]]
@@ -5389,7 +5405,7 @@ dependencies = [
  "heck 0.3.3",
  "itertools 0.10.5",
  "log",
- "multimap 0.8.3",
+ "multimap",
  "petgraph 0.5.1",
  "prost 0.8.0",
  "prost-types 0.8.0",
@@ -5405,9 +5421,9 @@ checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
 dependencies = [
  "bytes",
  "heck 0.5.0",
- "itertools 0.12.1",
+ "itertools 0.10.5",
  "log",
- "multimap 0.10.0",
+ "multimap",
  "once_cell",
  "petgraph 0.6.5",
  "prettyplease",
@@ -5438,7 +5454,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
- "itertools 0.12.1",
+ "itertools 0.10.5",
  "proc-macro2",
  "quote",
  "syn 2.0.90",
@@ -5451,7 +5467,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3"
 dependencies = [
  "anyhow",
- "itertools 0.13.0",
+ "itertools 0.10.5",
  "proc-macro2",
  "quote",
  "syn 2.0.90",
@@ -6836,7 +6852,7 @@ dependencies = [
  "anyhow",
  "serde 1.0.216",
  "serde_json",
- "spin-locked-app",
+ "spin-locked-app 3.0.0",
 ]
 
 [[package]]
@@ -6876,7 +6892,7 @@ dependencies = [
  "indexmap 2.7.0",
  "semver",
  "spin-app",
- "spin-serde",
+ "spin-serde 3.0.0",
  "thiserror 1.0.69",
  "wac-graph",
 ]
@@ -6900,7 +6916,19 @@ dependencies = [
  "anyhow",
  "async-trait",
  "futures",
- "spin-locked-app",
+ "spin-locked-app 3.0.0",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "spin-expressions"
+version = "3.1.1"
+source = "git+https://github.com/fermyon/spin?tag=v3.1.1#aa919ce36a5f6c45e6c9b66bcd94657281f44bf3"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "futures",
+ "spin-locked-app 3.1.1",
  "thiserror 1.0.69",
 ]
 
@@ -6914,7 +6942,7 @@ dependencies = [
  "serde 1.0.216",
  "spin-core",
  "spin-factors",
- "spin-locked-app",
+ "spin-locked-app 3.0.0",
  "spin-resource-table",
  "spin-world",
  "thiserror 1.0.69",
@@ -6933,7 +6961,7 @@ dependencies = [
  "serde 1.0.216",
  "spin-factors",
  "spin-llm-remote-http",
- "spin-locked-app",
+ "spin-locked-app 3.0.0",
  "spin-world",
  "tokio",
  "toml 0.8.19",
@@ -7011,13 +7039,13 @@ dependencies = [
  "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "serde 1.0.216",
- "spin-expressions",
+ "spin-expressions 3.0.0",
  "spin-factor-variables",
  "spin-factor-wasi",
  "spin-factors",
- "spin-locked-app",
+ "spin-locked-app 3.0.0",
  "spin-manifest",
- "spin-serde",
+ "spin-serde 3.0.0",
  "tracing",
  "url",
  "urlencoding",
@@ -7065,7 +7093,7 @@ source = "git+https://github.com/fermyon/spin?tag=v3.0.0#737778e9d7dc1a7f590a398
 dependencies = [
  "async-trait",
  "spin-factors",
- "spin-locked-app",
+ "spin-locked-app 3.0.0",
  "spin-resource-table",
  "spin-world",
  "tokio",
@@ -7077,7 +7105,7 @@ name = "spin-factor-variables"
 version = "3.0.0"
 source = "git+https://github.com/fermyon/spin?tag=v3.0.0#737778e9d7dc1a7f590a398d2734ff0cc91002f0"
 dependencies = [
- "spin-expressions",
+ "spin-expressions 3.0.0",
  "spin-factors",
  "spin-world",
  "tracing",
@@ -7225,9 +7253,9 @@ dependencies = [
  "sha2",
  "spin-common",
  "spin-factor-outbound-networking",
- "spin-locked-app",
+ "spin-locked-app 3.0.0",
  "spin-manifest",
- "spin-serde",
+ "spin-serde 3.0.0",
  "tempfile",
  "tokio",
  "toml 0.8.19",
@@ -7244,7 +7272,20 @@ dependencies = [
  "async-trait",
  "serde 1.0.216",
  "serde_json",
- "spin-serde",
+ "spin-serde 3.0.0",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "spin-locked-app"
+version = "3.1.1"
+source = "git+https://github.com/fermyon/spin?tag=v3.1.1#aa919ce36a5f6c45e6c9b66bcd94657281f44bf3"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "serde 1.0.216",
+ "serde_json",
+ "spin-serde 3.1.1",
  "thiserror 1.0.69",
 ]
 
@@ -7257,12 +7298,12 @@ dependencies = [
  "indexmap 2.7.0",
  "semver",
  "serde 1.0.216",
- "spin-serde",
+ "spin-serde 3.0.0",
  "terminal",
  "thiserror 1.0.69",
  "toml 0.8.19",
  "url",
- "wasm-pkg-common",
+ "wasm-pkg-common 0.4.1",
 ]
 
 [[package]]
@@ -7286,7 +7327,7 @@ dependencies = [
  "serde_json",
  "spin-common",
  "spin-loader",
- "spin-locked-app",
+ "spin-locked-app 3.0.0",
  "tempfile",
  "tokio",
  "tokio-util",
@@ -7363,7 +7404,19 @@ dependencies = [
  "base64 0.22.1",
  "semver",
  "serde 1.0.216",
- "wasm-pkg-common",
+ "wasm-pkg-common 0.4.1",
+]
+
+[[package]]
+name = "spin-serde"
+version = "3.1.1"
+source = "git+https://github.com/fermyon/spin?tag=v3.1.1#aa919ce36a5f6c45e6c9b66bcd94657281f44bf3"
+dependencies = [
+ "anyhow",
+ "base64 0.22.1",
+ "semver",
+ "serde 1.0.216",
+ "wasm-pkg-common 0.8.5",
 ]
 
 [[package]]
@@ -7512,7 +7565,7 @@ dependencies = [
  "azure_security_keyvault",
  "dotenvy",
  "serde 1.0.216",
- "spin-expressions",
+ "spin-expressions 3.0.0",
  "spin-factor-variables",
  "spin-factors",
  "spin-world",
@@ -8399,7 +8452,7 @@ dependencies = [
  "serde 1.0.216",
  "spin-app",
  "spin-core",
- "spin-expressions",
+ "spin-expressions 3.0.0",
  "spin-factor-variables",
  "spin-factors",
  "spin-runtime-factors",
@@ -8489,7 +8542,7 @@ version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "rand 0.8.5",
  "static_assertions",
 ]
@@ -9115,6 +9168,27 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "wasm-pkg-common"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b14acb8e490839c93364c23716feb9af0dd93e0638b8b5e083b1d0803b7ea595"
+dependencies = [
+ "anyhow",
+ "bytes",
+ "etcetera",
+ "futures-util",
+ "http 1.2.0",
+ "semver",
+ "serde 1.0.216",
+ "serde_json",
+ "sha2",
+ "thiserror 1.0.69",
+ "tokio",
+ "toml 0.8.19",
+ "tracing",
+]
+
 [[package]]
 name = "wasm-pkg-loader"
 version = "0.4.1"
@@ -9143,7 +9217,7 @@ dependencies = [
  "url",
  "warg-client",
  "warg-protocol",
- "wasm-pkg-common",
+ "wasm-pkg-common 0.4.1",
 ]
 
 [[package]]
diff --git a/containerd-shim-spin/Cargo.toml b/containerd-shim-spin/Cargo.toml
index cfe9ac1..d04b7ef 100644
--- a/containerd-shim-spin/Cargo.toml
+++ b/containerd-shim-spin/Cargo.toml
@@ -31,7 +31,7 @@ spin-manifest = { git = "https://github.com/fermyon/spin", tag = "v3.0.0" }
 spin-loader = { git = "https://github.com/fermyon/spin", tag = "v3.0.0" }
 spin-oci = { git = "https://github.com/fermyon/spin", tag = "v3.0.0" }
 spin-common = { git = "https://github.com/fermyon/spin", tag = "v3.0.0" }
-spin-expressions = { git = "https://github.com/fermyon/spin", tag = "v3.0.0" }
+spin-expressions = { git = "https://github.com/fermyon/spin", tag = "v3.1.1" }
 spin-factors-executor = { git = "https://github.com/fermyon/spin", tag = "v3.0.0" }
 spin-telemetry = { git = "https://github.com/fermyon/spin", tag = "v3.0.0" }
 spin-runtime-factors = { git = "https://github.com/fermyon/spin", tag = "v3.0.0" }