diff --git a/compiled_starters/rust/.codecrafters/run.sh b/compiled_starters/rust/.codecrafters/run.sh
index 5051f21..92ac49e 100755
--- a/compiled_starters/rust/.codecrafters/run.sh
+++ b/compiled_starters/rust/.codecrafters/run.sh
@@ -6,4 +6,6 @@
 #
 # Learn more: https://codecrafters.io/program-interface
 
+set -e # Exit on failure
+
 exec /tmp/codecrafters-build-http-server-rust/release/codecrafters-http-server "$@"
diff --git a/compiled_starters/rust/README.md b/compiled_starters/rust/README.md
index d672500..34f6f88 100644
--- a/compiled_starters/rust/README.md
+++ b/compiled_starters/rust/README.md
@@ -30,7 +30,7 @@ Time to move on to the next stage!
 
 Note: This section is for stages 2 and beyond.
 
-1. Ensure you have `cargo (1.82)` installed locally
+1. Ensure you have `cargo (1.85)` installed locally
 1. Run `./your_program.sh` to run your program, which is implemented in
    `src/main.rs`. This command compiles your Rust project, so it might be slow
    the first time you run it. Subsequent runs will be fast.
diff --git a/compiled_starters/rust/codecrafters.yml b/compiled_starters/rust/codecrafters.yml
index fe3fb23..1085350 100644
--- a/compiled_starters/rust/codecrafters.yml
+++ b/compiled_starters/rust/codecrafters.yml
@@ -7,5 +7,5 @@ debug: false
 # Use this to change the Rust version used to run your code
 # on Codecrafters.
 #
-# Available versions: rust-1.82
-language_pack: rust-1.82
+# Available versions: rust-1.85
+language_pack: rust-1.85
diff --git a/dockerfiles/rust-1.85.Dockerfile b/dockerfiles/rust-1.85.Dockerfile
new file mode 100644
index 0000000..d3c4e86
--- /dev/null
+++ b/dockerfiles/rust-1.85.Dockerfile
@@ -0,0 +1,13 @@
+# syntax=docker/dockerfile:1.7-labs
+FROM rust:1.85-bookworm
+
+# Rebuild the container if these files change
+ENV CODECRAFTERS_DEPENDENCY_FILE_PATHS="Cargo.toml,Cargo.lock"
+
+WORKDIR /app
+
+# .git & README.md are unique per-repository. We ignore them on first copy to prevent cache misses
+COPY --exclude=.git --exclude=README.md . /app
+
+# This runs cargo build
+RUN .codecrafters/compile.sh
diff --git a/solutions/rust/01-at4/code/.codecrafters/run.sh b/solutions/rust/01-at4/code/.codecrafters/run.sh
index 5051f21..92ac49e 100755
--- a/solutions/rust/01-at4/code/.codecrafters/run.sh
+++ b/solutions/rust/01-at4/code/.codecrafters/run.sh
@@ -6,4 +6,6 @@
 #
 # Learn more: https://codecrafters.io/program-interface
 
+set -e # Exit on failure
+
 exec /tmp/codecrafters-build-http-server-rust/release/codecrafters-http-server "$@"
diff --git a/solutions/rust/01-at4/code/README.md b/solutions/rust/01-at4/code/README.md
index d672500..34f6f88 100644
--- a/solutions/rust/01-at4/code/README.md
+++ b/solutions/rust/01-at4/code/README.md
@@ -30,7 +30,7 @@ Time to move on to the next stage!
 
 Note: This section is for stages 2 and beyond.
 
-1. Ensure you have `cargo (1.82)` installed locally
+1. Ensure you have `cargo (1.85)` installed locally
 1. Run `./your_program.sh` to run your program, which is implemented in
    `src/main.rs`. This command compiles your Rust project, so it might be slow
    the first time you run it. Subsequent runs will be fast.
diff --git a/solutions/rust/01-at4/code/codecrafters.yml b/solutions/rust/01-at4/code/codecrafters.yml
index fe3fb23..1085350 100644
--- a/solutions/rust/01-at4/code/codecrafters.yml
+++ b/solutions/rust/01-at4/code/codecrafters.yml
@@ -7,5 +7,5 @@ debug: false
 # Use this to change the Rust version used to run your code
 # on Codecrafters.
 #
-# Available versions: rust-1.82
-language_pack: rust-1.82
+# Available versions: rust-1.85
+language_pack: rust-1.85
diff --git a/starter_templates/rust/code/.codecrafters/run.sh b/starter_templates/rust/code/.codecrafters/run.sh
index 5051f21..92ac49e 100755
--- a/starter_templates/rust/code/.codecrafters/run.sh
+++ b/starter_templates/rust/code/.codecrafters/run.sh
@@ -6,4 +6,6 @@
 #
 # Learn more: https://codecrafters.io/program-interface
 
+set -e # Exit on failure
+
 exec /tmp/codecrafters-build-http-server-rust/release/codecrafters-http-server "$@"
diff --git a/starter_templates/rust/config.yml b/starter_templates/rust/config.yml
index 39ee560..d0f03e8 100644
--- a/starter_templates/rust/config.yml
+++ b/starter_templates/rust/config.yml
@@ -1,3 +1,3 @@
 attributes:
-  required_executable: cargo (1.82)
+  required_executable: cargo (1.85)
   user_editable_file: src/main.rs