diff --git a/releases/cli-releases.md b/releases/cli-releases.md
index 0c89cba4..a47f6d86 100644
--- a/releases/cli-releases.md
+++ b/releases/cli-releases.md
@@ -3,6 +3,6 @@
| Component | Current version |
| --------------------- | --------------- |
| CLI version (Stable) | 3.17.2 |
-| CLI version (Staging) | 3.18.6 |
+| CLI version (Staging) | 3.18.7 |
* [Moderne CLI reference docs](../user-documentation/moderne-cli/cli-reference.md)
diff --git a/user-documentation/moderne-cli/getting-started/cli-intro.md b/user-documentation/moderne-cli/getting-started/cli-intro.md
index d764a8b0..e3bfc59d 100644
--- a/user-documentation/moderne-cli/getting-started/cli-intro.md
+++ b/user-documentation/moderne-cli/getting-started/cli-intro.md
@@ -62,7 +62,7 @@ If everything was configured correctly, you should be able to type `mod` into yo
```bash
➜ mod
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
Usage:
@@ -255,7 +255,7 @@ cd $HOME/workshop
You should see output similar to the following.
```bash
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Listing repositories from Moderne
@@ -338,7 +338,7 @@ mod build .
You should see output similar to the following.
```bash
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Selecting repositories
@@ -469,7 +469,7 @@ mod run . --recipe DependencyVulnerabilityCheck
You should see output similar to the following.
```bash
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Selecting repositories
@@ -586,7 +586,7 @@ mod study . --last-recipe-run --data-table VulnerabilityReport
You should see output similar to the following.
```bash
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
Found recipe run 20240716083055-NH4Xb
@@ -696,7 +696,7 @@ mod run . --recipe CommonStaticAnalysis
You should see output similar to the following.
```bash
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Selecting repositories
@@ -784,7 +784,7 @@ mod git checkout . -b workshop-changes --last-recipe-run
You should see output similar to the following.
```bash
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
Found recipe run 20240717084152-vY22R
diff --git a/user-documentation/moderne-cli/how-to-guides/air-gapped-cli-install.md b/user-documentation/moderne-cli/how-to-guides/air-gapped-cli-install.md
index be45d6a6..cf36bb7e 100644
--- a/user-documentation/moderne-cli/how-to-guides/air-gapped-cli-install.md
+++ b/user-documentation/moderne-cli/how-to-guides/air-gapped-cli-install.md
@@ -51,7 +51,7 @@ If everything was configured correctly, you should be able to type `mod` into yo
```bash
➜ mod
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
Usage:
diff --git a/user-documentation/moderne-cli/how-to-guides/jdk-selection-and-config.md b/user-documentation/moderne-cli/how-to-guides/jdk-selection-and-config.md
index 459cb260..ec39a2e7 100644
--- a/user-documentation/moderne-cli/how-to-guides/jdk-selection-and-config.md
+++ b/user-documentation/moderne-cli/how-to-guides/jdk-selection-and-config.md
@@ -31,7 +31,7 @@ mod config java jdk list
```shell
➜ moderne-cli git:(main) ✗ mod config java jdk list
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Listing available JDKs
diff --git a/user-documentation/workshops/air-gapped-cli.md b/user-documentation/workshops/air-gapped-cli.md
index 31acf094..f13ad2f1 100644
--- a/user-documentation/workshops/air-gapped-cli.md
+++ b/user-documentation/workshops/air-gapped-cli.md
@@ -162,7 +162,7 @@ Here is what the results look like if everything ran correctly:
```bash
➜ mod git clone csv ./spring-data repos.csv --filter=tree:0
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Reading CSV file
@@ -200,7 +200,7 @@ Notice that you didn't need to configure Maven or Gradle, select Java versions,
```bash
➜ mod build ./spring-data
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Selecting repositories
@@ -255,7 +255,7 @@ To view the diff, you can command + click on the file (or ctrl + click if on Win
```bash
➜ mod run ./spring-data --recipe CommonStaticAnalysis
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Selecting repositories
@@ -329,7 +329,7 @@ MOD SUCCEEDED in (2m 6s)
```bash
➜ mod run ./spring-data --recipe UpgradeToJava17
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Selecting repositories
@@ -422,7 +422,7 @@ You should see:
```bash
➜ mod study ./spring-data --last-recipe-run --data-table SourcesFileResults
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
Found recipe run 20240430092847-434iK
diff --git a/user-documentation/workshops/moderne-cli-exercise.md b/user-documentation/workshops/moderne-cli-exercise.md
index 5122e0b0..af303ab4 100644
--- a/user-documentation/workshops/moderne-cli-exercise.md
+++ b/user-documentation/workshops/moderne-cli-exercise.md
@@ -23,7 +23,7 @@ After that, we'll provide some additional examples that show other capabilities
```
➜ mod
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
Usage:
@@ -101,7 +101,7 @@ mod config recipes moderne install UpgradeSpringBoot_3_2
```shell
➜ mod config recipes moderne install UpgradeSpringBoot_3_2
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
[1] Migrate to Spring Boot 3.2
[2] Migrate to Spring Boot 3.1
@@ -190,7 +190,7 @@ mod build $HOME/workshop
You should see output similar to the following.
```bash
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Selecting repositories
@@ -244,7 +244,7 @@ You can preview the changes by command/ctrl clicking on the patch file generated
```bash
➜ ~ mod run $HOME/workshop --recipe UpgradeSpringBoot_3_2
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Selecting repositories
@@ -309,7 +309,7 @@ mod git clone moderne . "Default"
You should see output similar to the following.
```bash
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Listing repositories from Moderne
@@ -349,7 +349,7 @@ mod build .
You should see output similar to the following.
```bash
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Selecting repositories
@@ -468,7 +468,7 @@ mod run . --recipe UpgradeToJava17
You should see results similar to the following
```bash
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Selecting repositories
@@ -555,7 +555,7 @@ mod study . --last-recipe-run --data-table SourcesFileResults
You should see results similar to the following.
```bash
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
Found recipe run 20240429093354-reHx5
@@ -657,7 +657,7 @@ mod run . --recipe org.openrewrite.staticanalysis.CommonStaticAnalysis
You should see results similar to:
```bash
-Moderne CLI 3.18.6
+Moderne CLI 3.18.7
> Selecting repositories