diff --git a/src/main/resources/META-INF/rewrite/java-version-17.yml b/src/main/resources/META-INF/rewrite/java-version-17.yml
index 0020e665d3..b74763f236 100644
--- a/src/main/resources/META-INF/rewrite/java-version-17.yml
+++ b/src/main/resources/META-INF/rewrite/java-version-17.yml
@@ -18,6 +18,9 @@ type: specs.openrewrite.org/v1beta/recipe
 name: org.openrewrite.java.migrate.JavaVersion17
 displayName: Change Maven Java version property values to 17
 description: Change maven.compiler.source and maven.compiler.target values to 17.
+tags:
+  - java17
+  - compiler
 recipeList:
   - org.openrewrite.maven.ChangePropertyValue:
       key: java.version
@@ -31,4 +34,3 @@ recipeList:
       key: maven.compiler.target
       newValue: 17
       addIfMissing: false
-  - org.openrewrite.java.migrate.lang.StringFormatted
diff --git a/src/main/resources/META-INF/rewrite/upgrade-java-17.yml b/src/main/resources/META-INF/rewrite/upgrade-java-17.yml
new file mode 100644
index 0000000000..18dba71729
--- /dev/null
+++ b/src/main/resources/META-INF/rewrite/upgrade-java-17.yml
@@ -0,0 +1,29 @@
+#
+# Copyright 2022 the original author or authors.
+# <p>
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# <p>
+# https://www.apache.org/licenses/LICENSE-2.0
+# <p>
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.java.migrate.UpgradeJava17
+displayName: Upgrade to Java 17
+description: This recipe will apply changes commonly needed when migrating to Java 17, including intermediate versions.
+tags:
+  - java17
+  - lombok
+recipeList:
+  - org.openrewrite.java.migrate.Java8toJava11
+  # Update compiler source and target versions
+  - org.openrewrite.java.migrate.JavaVersion17
+  - org.openrewrite.java.migrate.lang.StringFormatted
+  - org.openrewrite.java.migrate.lombok.LombokValToFinalVar