corrode · mre · Jun 17, 2026 · Jun 17, 2026 · Jun 17, 2026 · Jun 17, 2026
diff --git a/content/blog/bugs-rust-wont-catch/index.md b/content/blog/bugs-rust-wont-catch/index.md
@@ -376,10 +376,4 @@ The type system can encode many things, but it cannot encode conditions outside
 
 Idiomatic Rust, then, is not just code that the borrow checker accepts or that `clippy` leaves alone. It is code whose types, names, and control flow tell the *truth* about the system they run in. And that truth is sometimes ugly. It could mean using file descriptors instead of paths, `OsStr` instead of `String`, [`?` instead of `unwrap`](/blog/pitfalls-of-safe-rust/), and bug-for-bug compatibility over clean semantics. None of it is as pretty as the version you would write on a whiteboard. But it is more honest.
 
-{% info(title="Need Help Hardening Your Rust Codebase?", icon="crab") %}
-
-Is your team shipping Rust into production and want to make sure you're not falling into the same traps?
-I offer Rust consulting services, from code reviews and security-focused audits to training your team on the patterns that the compiler won't enforce for you.
-[Get in touch](/#contact) to learn more.
-
-{% end %}
+{{ next_steps(context="Shipping Rust to production and want to make sure you're not falling into the traps the compiler won't catch?") }}
diff --git a/content/blog/cpp-rust-interop/index.md b/content/blog/cpp-rust-interop/index.md
@@ -103,13 +103,7 @@ Here are some key takeaways from Tyler's experiences with Rust and C++:
 
 As Tyler's experiences illustrate, the benefits of Rust often become most apparent in the "day two operations" of software development – in code reviews, refactoring, and managing complexity.
 
-{% info(title="Make the most of Rust", icon="crab") %}
-
-Is your company considering to migrate from C++ to Rust? 
-I offer consulting services to get you up to speed with your Rust projects, from training your team to code reviews and architecture consulting. 
-Check out my [services page](/services) to learn more.
-
-{% end %}
+{{ next_steps(context="Moving a C++ codebase to Rust? Getting the interop boundaries right is exactly the kind of decision that pays off with a second pair of eyes.") }}
 
 ## Recommended Reading
 

diff --git a/content/blog/hiring-rust-engineers/index.md b/content/blog/hiring-rust-engineers/index.md
@@ -141,11 +141,5 @@ work with your hiring manager to help them understand how to hire more Rust devs
 
 Good luck with your Rust hiring process!
 
-{% info(title="Is your company adopting Rust?", icon="crab") %}
-
-Let me help you make the most of Rust.
-I offer consulting services to get you up to speed with your Rust projects, from training your team to code reviews and architecture consulting. 
-Check out my [services page](/services) to learn more.
-
-{% end %}
+{{ next_steps(context="Building out a Rust team and want to set them up for long-term success?") }}
 
diff --git a/content/blog/long-term-rust-maintenance/index.md b/content/blog/long-term-rust-maintenance/index.md
@@ -577,11 +577,7 @@ tooling, and active community.
 By following the principles outlined in this post, you can
 ensure that your codebase remains robust and maintainable for years to come.
 
-{% info(title="Supercharge Your Rust Adoption", icon="radio") %}
-
 If you want to learn from top companies that have successfully adopted Rust,
-consider subscribing to the [Rust In Production Podcast](/podcast).
-
-In case your company is considering to adopt Rust for a new project, feel free to reach out for a [consultation](/#contact).
+consider subscribing to the [Rust in Production Podcast](/podcast).
 
-{% end %}
+{{ next_steps(context="Planning Rust for the long haul and want a codebase that stays maintainable for years?") }}
diff --git a/content/blog/memory-safety/index.md b/content/blog/memory-safety/index.md
@@ -55,14 +55,6 @@ This is a **global, bipartisan, cross-sector consensus** that memory-unsafe code
 
 The direction is clear. The question is not _whether_ your organization will need to address this, it's _when_, and whether you'll do so on your own terms or under external pressure.
 
-{% info(title="Where Does Your Organization Stand?", icon="warning") %}
-
-If your software touches critical infrastructure, handles sensitive data, or ships into regulated markets, the regulatory direction above applies to you. Most organizations I work with underestimate how long it takes to build internal Rust expertise and draft a credible memory safety roadmap.
-
-I help companies close that gap, typically saving months of trial and error. **[Book a free assessment call](/#contact)** and let's figure out your exposure before deadlines set the pace.
-
-{% end %}
-
 ## Memory Safety Vulnerabilities Are Everywhere
 
 Before we talk about regulation, let's talk about the problem.
@@ -253,48 +245,13 @@ At a minimum:
 4. Interim mitigations for code that won't be migrated soon (compiler hardening, fuzzing, static analysis).
 5. A timeline with milestones showing a credible, prioritized reduction of memory safety vulnerabilities.
 
-This is exactly the kind of work I do with my clients at [corrode](/services/). We've helped organizations across industries, from 
-cloud infrastructure to embedded devices to backend services, develop practical Rust adoption strategies (see our [case studies](/learn/case-studies/) for real-world examples).
-
 (For a complete guide on the organizational side, see our [Rust Business Adoption Checklist](/blog/successful-rust-business-adoption-checklist/).)
 
 ## You Don't Have to Do This Alone
 
-Making this transition on your own, on top of an already overwhelming workload, is hard.
-But here's the good news: **you don't need to figure this out from scratch**.
-
-The Rust ecosystem is mature, the tooling is excellent, and there is a growing body of industry experience to draw from. What most organizations lack is not motivation. It's **guidance**.
-
-That's where I come in.
-
-At [corrode](/) I provide Rust consulting and training specifically designed for organizations navigating this transition. I've helped teams:
-
-- Evaluate whether Rust is the right fit for their specific use case.
-- Build memory safety roadmaps aligned with CISA and EU CRA requirements.
-- Train existing C/C++ developers to become productive in Rust.
-- Architect interoperability layers between legacy C/C++ and new Rust code.
-- Review and audit Rust codebases for production readiness.
-- Hire and grow Rust teams (see our guide on [hiring Rust engineers](/blog/hiring-rust-engineers/)).
-
-I've also spent years documenting real-world Rust adoption through the [**Rust in Production podcast**](/podcast/), where companies like [Microsoft](/podcast/s04e01-microsoft/), [Cloudflare](/podcast/s05e03-cloudflare/), [1Password](/podcast/s04e06-1password/), [Volvo](/podcast/s03e08-volvo/), and [many others](/podcast/) share their experiences.
-
-I write about the practicalities of long-term Rust adoption on this blog, from [flattening the learning curve](/blog/flattening-rusts-learning-curve/) to [long-term maintenance strategies](/blog/long-term-rust-maintenance/) to understanding [Rust for foundational software](/blog/foundational-software/).
+Making this transition on your own, on top of an already overwhelming workload, is hard. But the Rust ecosystem is mature, the tooling is excellent, and there is a growing body of industry experience to draw from.
 
-## The Cost of Inaction Far Exceeds the Cost of Action
-
-Let me put it in business terms.
-
-Engaging a Rust consultant is an **insurance** policy for your organization.
-The cost of a consulting engagement is a rounding error compared to:
-
-- A single critical CVE in production ($150,000+ per Microsoft's estimate).
-- A regulatory non-compliance penalty under the EU Cyber Resilience Act.
-- An emergency scramble to produce a memory safety roadmap when your government customer asks for one.
-- The reputational damage of a headline-grabbing breach traced to a buffer overflow in 2026.
-
-**Starting now means you control the timeline, the budget, and the scope.** You choose which components to migrate first. You train your team at a sustainable pace. You build institutional knowledge before you _need_ it.
-
-Waiting means someone else, a regulator, a customer, a competitor, dictates the terms.
+I've documented real-world Rust adoption through the [**Rust in Production podcast**](/podcast/), where companies like [Microsoft](/podcast/s04e01-microsoft/), [Cloudflare](/podcast/s05e03-cloudflare/), [1Password](/podcast/s04e06-1password/), [Volvo](/podcast/s03e08-volvo/), and [many others](/podcast/) share their experiences. I also write about long-term Rust adoption on this blog, from [flattening the learning curve](/blog/flattening-rusts-learning-curve/) to [long-term maintenance strategies](/blog/long-term-rust-maintenance/) to [Rust for foundational software](/blog/foundational-software/).
 
 ## Next Steps
 
@@ -309,17 +266,7 @@ Here's what I recommend:
 
 I'd love to help you with any or all of the above.
 
-{% info(title="Let's Talk About Your Memory Safety Strategy", icon="crab") %}
-
-If you're evaluating Rust or need to build a memory safety roadmap for compliance, [reach out for a free initial consultation](/#contact).
-
-I work with organizations of all sizes, from startups to Fortune 500 companies, to make Rust adoption practical, sustainable, and aligned with regulatory requirements.
-
-Let's make sure your organization is ahead of the curve, not behind it.
-
-**[Get in touch →](/#contact)**
-
-{% end %}
+{{ next_steps(context="Evaluating Rust or building a memory safety roadmap for compliance?") }}
 
 ## Frequently Asked Questions
 

diff --git a/content/blog/pitfalls-of-safe-rust/index.md b/content/blog/pitfalls-of-safe-rust/index.md
@@ -914,10 +914,4 @@ That's why testing, linting, and fuzzing are still important in Rust.
 For maximum robustness, combine Rust's safety guarantees with strict checks and
 strong verification methods.
 
-{% info(title="Let an Expert Review Your Rust Code", icon="crab") %}
-
-I hope you found this article helpful!
-If you want to take your Rust code to the next level, consider a code review by an expert.
-I offer code reviews for Rust projects of all sizes. [Get in touch](/services/) to learn more.
-
-{% end %}
+{{ next_steps(context="Want a second pair of expert eyes on your Rust code before it ships?") }}
diff --git a/content/blog/rust-learning-resources-2026/index.md b/content/blog/rust-learning-resources-2026/index.md
@@ -142,12 +142,4 @@ All the material is open source and free. You can browse the [full workshop cata
 You can go through the material on your own to see if it fits your needs.
 Once you're ready, feel free to reach out about tailoring the content for you and your team.
 
-{% info(title="Speed Up Your Learning Process", icon="crab") %}
-
-Is your company considering a switch to Rust? 
-
-Rust is known for its steep learning curve, but with the right resources and guidance, you can become proficient in a matter of weeks. I offer hands-on workshops and training for teams and individuals who want to accelerate their learning process. 
-
-Check out my [services page](/services) or [send me an email](mailto:hi@corrode.dev?subject=Rust%20Workshops) to learn more.
-
-{% end %}
+{{ next_steps(context="Want to accelerate past Rust's learning curve with hands-on guidance?") }}
diff --git a/content/blog/rust-prevents-data-races-not-race-conditions/index.md b/content/blog/rust-prevents-data-races-not-race-conditions/index.md
@@ -357,9 +357,4 @@ Rust holds an enormous amount for you, and what remains is the part that lives i
 
 If you want to go deeper on the concurrency side of this, read [Rust Atomics and Locks](https://mara.nl/atomics/) by Mara Bos. It's free online.
 
-{% info(title="Want to get concurrency right in your Rust codebase?", icon="crab") %}
-
-I offer Rust consulting, from code reviews and audits to training your team on the patterns the compiler won't enforce for you, including the concurrency traps in this post.
-[Get in touch](/#contact) to learn more.
-
-{% end %}
+{{ next_steps(context="Want to get concurrency right in your Rust codebase, including the traps covered in this post?") }}
diff --git a/content/blog/successful-rust-business-adoption-checklist/index.md b/content/blog/successful-rust-business-adoption-checklist/index.md
@@ -451,9 +451,4 @@ By acknowledging the challenges and following these strategies, you can ensure a
 
 Check out our ['Rust in Production' podcast](/podcast/) for insights from industry experts on how their teams successfully adopted Rust in production. 
 
-{% info(title="Need Help with Your Rust Project?") %}
-
-If you're considering adopting Rust for your next project, I can help you get started.
-[Reach out for a free consultation](/#contact) if you need help with your Rust project. I'm happy to help you get the most out of Rust and guide you through the process.
-
-{% end %}
+{{ next_steps(context="Considering Rust for your next project and want guidance from someone who's done it before?") }}
diff --git a/content/blog/tips-for-faster-ci-builds/index.md b/content/blog/tips-for-faster-ci-builds/index.md
@@ -299,10 +299,4 @@ If you've implemented all these optimizations and your builds are still slow, it
 Remember that each project is unique.
 Start with the easier wins like Swatinem's cache action and `--locked` flag, then progressively implement more advanced optimizations as needed. Monitor your CI metrics to ensure the changes are having the desired effect.
 
-{% info(title="Need Professional Support?", icon="crab") %}
-
-Is your Rust CI still too slow despite implementing these optimizations?
-I can help you identify and fix performance bottlenecks in your build pipeline.
-[Book a free consultation](/services) to discuss your specific needs.
-
-{% end %}
+{{ next_steps(context="Is your Rust CI still too slow despite these optimizations?") }}
diff --git a/content/blog/tips-for-faster-rust-compile-times/index.md b/content/blog/tips-for-faster-rust-compile-times/index.md
@@ -1190,8 +1190,4 @@ I hope that you were able to use some of these tips to speed up your Rust builds
 In case you found other ways to speed up your Rust builds, or if you have any
 questions or feedback, I'd love to hear from you.
 
-{% info(title="Get Professional Support", icon="crab") %}
-If you need support for commercial Rust projects,
-I can also help you with performance problems and reducing your build times.
-[Get in touch.](/services)
-{% end %}
+{{ next_steps(context="Fighting slow Rust builds on a commercial project?") }}
diff --git a/content/blog/why-rust/index.md b/content/blog/why-rust/index.md
@@ -660,21 +660,7 @@ invaluable. Equally, if you are ready to embrace Rust and are seeking expertise
 in training or consulting to ensure a smooth transition, specialized support is
 essential.
 
-[Get in touch](/services/) to explore if Rust is the right choice for your
-organization and how it can contribute to your long-term success. 
-
-{% info(title="Rust in Production Podcast", icon="radio") %}
-Real-world experiences are the best way to learn about the benefits and
-challenges of a technology. That's why we started <a href="/podcast">Rust in Production</a>, a
-podcast about companies that bet big on Rust.
-
-Listen to the first-hand accounts from decision-makers about why they chose Rust and how it
-impacted their business.
-Each episode is a deep dive into the motivations, challenges, and lessons learned
-from adopting Rust in production by companies that shape the future of infrastructure.
-
-<a href="/podcast">More information here</a>.
-{% end %}
+{{ next_steps(context="Weighing whether Rust is the right choice for your organization?") }}
 
 ## Talks
 

diff --git a/content/pro/_index.md → content/mentorship/_index.md b/content/pro/_index.md → content/mentorship/_index.md
@@ -1,7 +1,8 @@
 +++
 title = "Personal Rust Mentorship"
-template = "pro.html"
+template = "mentorship.html"
 description = "Master Rust from first principles with personalized mentorship. Work 1-on-1 with an expert to build deep intuition for systems programming."
+aliases = ["pro"]
 +++
 
 <div class="pro-hero">
@@ -29,7 +30,7 @@ Spend time programming at the edge of your abilities with expert 1-on-1 coaching
 <div class="pro-container-narrow pro-text-center">
 <h2 class="pro-section-title">Focused on your success</h2>
 
-<img src="/pro/mentor.svg" alt="Mentorship vs Self-learning chart" class="pro-mentor-chart" />
+<img src="/mentorship/mentor.svg" alt="Mentorship vs Self-learning chart" class="pro-mentor-chart" />
 
 <p class="pro-section-subtitle pro-subtitle-wide">
     Learning Rust can feel overwhelming.
@@ -136,20 +137,20 @@ We'll work on what matters to you: whether that's language fundamentals, systems
 <div class="pro-value-item">
 <h2>Discover the joy of <span class="highlight">Rust</span></h2>
 <p>We'll cover ownership, lifetimes, and design patterns from the ground up. Learn what separates the good from the best, and write production-ready Rust code you can maintain for years to come.</p>
-<img src="/pro/ferris-master.png" alt="Ferris the Crab as a Wizard" class="pro-value-image" />
+<img src="/mentorship/ferris-master.png" alt="Ferris the Crab as a Wizard" class="pro-value-image" />
 <p>You'll gain the confidence to "open the hood" and see how things really work, moving past surface-level abstractions. We'll dive into the standard library source code and learn how to navigate it without any additional tools.</p>
 </div>
 
 <div class="pro-value-item">
 <h2>Systems Design & <span class="highlight">Project Structure</span></h2>
 <p>Bring your own projects or work on mine. We'll explore how to structure applications and make design trade-offs in a way that feels natural, logical, and scales beautifully.</p>
-<img src="/pro/ferris-learn.png" alt="Ferris the Crab reading a book" class="pro-value-image" />
+<img src="/mentorship/ferris-learn.png" alt="Ferris the Crab reading a book" class="pro-value-image" />
 </div>
 
 <div class="pro-value-item">
 <h2>Learn Generously with Code Review</h2>
 <p>Learning how to give and receive kind, constructive feedback is an essential skill. I'll help you spot areas for improvement, communicate them effectively, and foster a collaborative engineering culture in your team.</p>
-<img src="/pro/ferris-builder.png" alt="Ferris the Crab surfing" class="pro-value-image" />
+<img src="/mentorship/ferris-builder.png" alt="Ferris the Crab surfing" class="pro-value-image" />
 </div>
 
 <div class="pro-value-item">
@@ -306,7 +307,7 @@ We'll work on what matters to you: whether that's language fundamentals, systems
   },
   {
     "q": "What if I can't make a scheduled session?",
-    "a": "Life happens. Just let me know and we'll move your session to another slot. Sessions in the Pack are valid for 3 months, and Deep Dive sessions for 6 months, so there's plenty of flexibility."
+    "a": "Life happens. Just let me know and we'll move your session to another slot. The 5-session block is valid for 3 months, and the 10-session block for 6 months, so there's plenty of flexibility."
   },
   {
     "q": "How do I know you're the right mentor?",

diff --git a/content/pro/ferris-builder.png → content/mentorship/ferris-builder.png b/content/pro/ferris-builder.png → content/mentorship/ferris-builder.png
diff --git a/content/pro/ferris-learn.png → content/mentorship/ferris-learn.png b/content/pro/ferris-learn.png → content/mentorship/ferris-learn.png
diff --git a/content/pro/ferris-master.png → content/mentorship/ferris-master.png b/content/pro/ferris-master.png → content/mentorship/ferris-master.png
diff --git a/content/pro/mentor.svg → content/mentorship/mentor.svg b/content/pro/mentor.svg → content/mentorship/mentor.svg
diff --git a/content/pro/social.png → content/mentorship/social.png b/content/pro/social.png → content/mentorship/social.png
diff --git a/content/services/_index.md b/content/services/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "From Prototype To Production In Half The Time"
+title = "Help Your Team Ship Production Rust in Half the Time"
 template = "page.html"
 sort_by = "date"
 description = "Friendly, professional Rust consulting services to help companies make the most of Rust. Our offerings include training, consulting, mentoring, code reviews, and team augmentation."
@@ -11,9 +11,13 @@ aliases = ["about"]
   Your browser does not support the video tag.
 </video>
 
+**Friendly, expert Rust consulting and training for engineering teams.** I help your team adopt Rust and ship production-grade services with confidence: faster, and without the costly missteps along the way.
+
+*Looking for help just for yourself? I also offer 1-on-1 [Rust mentorship](/mentorship) for individual engineers.*
+
 ## Here’s the problem...
 
-Rust is a complex language with a large API surface. Writing production-grade Rust requires a lot of architectural decisions. As a team lead excited about Rust, you're responsible for your project's success.
+You're a team lead, excited about Rust and responsible for your project's success. But Rust is a complex language with a large API surface, and writing production-grade Rust requires a lot of architectural decisions.
 Your team wants to do things right, but lacks experience, and you're trying to reduce risk.
 
 Courses alone won't cut it. Nameless agencies offer help, but they don't care about your project or team.
@@ -250,6 +254,7 @@ I'm thankful to be featured in various podcasts and interviews. Here are some of
 
 From time to time I give talks about Rust and open-source software.
 
+- code.talks 2025, Hamburg, Germany - [Rust Beyond The Hype](https://www.youtube.com/watch?v=AkBnXrKmcvw)
 - Softwerkskammer Cologne Meetup - [Testing in Rust](https://www.meetup.com/softwerkskammer-koln/events/300415441/)
 - inovex Meetup Cologne, Germany - [Rust in Production](https://speakerdeck.com/mre/rust-in-production)
 - FOSDEM 2024, Brussels, Belgium - [The Four Horsemen of Bad Rust Code](https://fosdem.org/2024/schedule/event/fosdem-2024-2434-the-four-horsemen-of-bad-rust-code/)