diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4557925e43..0282bddf72 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 # BUILDCACHE_USER
 # BUILDCACHE_PASS
 #   - rw access to buildcache.diffplug.com
-
+name: CI 🏭
 on:
   pull_request:
   push:
@@ -13,7 +13,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   sanity-check:
-    name: SanityCheck
+    name: Sanity Check 🦢
     runs-on: ubuntu-latest
     env:
       buildcacheuser: ${{ secrets.BUILDCACHE_USER }}
@@ -29,9 +29,9 @@ jobs:
           java-version: 21
       - name: gradle caching
         uses: gradle/actions/setup-gradle@v5
-      - name: spotlessCheck
+      - name: Spotless ✨
         run: ./gradlew spotlessCheck
-      - name: rewriteDryRun
+      - name: Rewrite ♻️
         run: ./gradlew rewriteDryRun
       - name: assemble testClasses
         run: ./gradlew assemble testClasses
diff --git a/gradle/rewrite.gradle b/gradle/rewrite.gradle
index 62f5170c46..2385d7d27f 100644
--- a/gradle/rewrite.gradle
+++ b/gradle/rewrite.gradle
@@ -21,8 +21,8 @@ rewrite {
 	failOnDryRunResults = true
 }
 dependencies {
-	rewrite('org.openrewrite.recipe:rewrite-migrate-java:3.22.0')
 	rewrite('org.openrewrite.recipe:rewrite-java-security:3.22.0')
+	rewrite('org.openrewrite.recipe:rewrite-migrate-java:3.22.0')
 	rewrite('org.openrewrite.recipe:rewrite-rewrite:0.16.0')
 	rewrite('org.openrewrite.recipe:rewrite-static-analysis:2.22.0')
 	rewrite('org.openrewrite.recipe:rewrite-third-party:0.31.2')
diff --git a/rewrite.yml b/rewrite.yml
index 0d318635e0..d318e9bce3 100644
--- a/rewrite.yml
+++ b/rewrite.yml
@@ -3,11 +3,6 @@ type: specs.openrewrite.org/v1beta/recipe
 name: com.diffplug.spotless.openrewrite.SanityCheck
 displayName: Apply all Java & Gradle best practices
 description: Comprehensive code quality recipe combining modernization, security, and best practices.
-tags:
-  - java
-  - gradle
-  - static-analysis
-  - cleanup
 recipeList:
   - org.openrewrite.gradle.EnableGradleBuildCache
   - org.openrewrite.gradle.EnableGradleParallelExecution
@@ -18,6 +13,7 @@ recipeList:
   - org.openrewrite.java.format.RemoveTrailingWhitespace
   - org.openrewrite.java.migrate.UpgradeToJava17
   - org.openrewrite.java.migrate.lang.StringRulesRecipes
+  - org.openrewrite.java.migrate.util.JavaLangAPIs
   - org.openrewrite.java.migrate.util.JavaUtilAPIs
   - org.openrewrite.java.migrate.util.MigrateInflaterDeflaterToClose
   - org.openrewrite.java.migrate.util.ReplaceStreamCollectWithToList
@@ -38,7 +34,6 @@ recipeList:
   - org.openrewrite.staticanalysis.RemoveUnusedLocalVariables
   - org.openrewrite.staticanalysis.RemoveUnusedPrivateFields
   - org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods
-  - org.openrewrite.staticanalysis.ReplaceApacheCommonsLang3ValidateNotNullWithObjectsRequireNonNull
   - org.openrewrite.staticanalysis.SimplifyTernaryRecipes
   - org.openrewrite.staticanalysis.URLEqualsHashCodeRecipes
   - org.openrewrite.staticanalysis.UnnecessaryCloseInTryWithResources
@@ -63,5 +58,4 @@ recipeList:
   - tech.picnic.errorprone.refasterrules.StreamRulesRecipes
   - tech.picnic.errorprone.refasterrules.StringRulesRecipes
   - tech.picnic.errorprone.refasterrules.TimeRulesRecipes
-  # - org.openrewrite.java.migrate.lang.FindVirtualThreadOpportunities # don't want to use: https://github.com/diffplug/spotless/pull/2684#discussion_r2433831887
 ---