diff --git a/src/main/scala/sbtghactions/WorkflowStep.scala b/src/main/scala/sbtghactions/WorkflowStep.scala
index b2a93da..f90dae8 100644
--- a/src/main/scala/sbtghactions/WorkflowStep.scala
+++ b/src/main/scala/sbtghactions/WorkflowStep.scala
@@ -64,6 +64,8 @@ object WorkflowStep {
             "github-token" -> s"$${{ secrets.GITHUB_TOKEN }}",
             "cache" -> "sbt"))
       case jv @ JavaSpec(JavaSpec.Distribution.GraalVM(Graalvm.Distribution(distribution)), version) =>
+        // Note: native-image is included by default in GraalVM for JDK 17+
+        // See: https://github.com/oracle/graal/pull/5995
         WorkflowStep.Use(
           Action.setupGraalvm,
           name = Some(s"Setup GraalVM (${jv.render})"),
@@ -71,7 +73,6 @@ object WorkflowStep {
           params = ListMap(
             "java-version" -> s"$version",
             "distribution" -> distribution,
-            "components" -> "native-image",
             "github-token" -> s"$${{ secrets.GITHUB_TOKEN }}",
             "cache" -> "sbt"))
       case jv @ JavaSpec(dist, version) =>
diff --git a/src/test/scala/sbtghactions/GenerativePluginSpec.scala b/src/test/scala/sbtghactions/GenerativePluginSpec.scala
index 7c12125..95e971e 100644
--- a/src/test/scala/sbtghactions/GenerativePluginSpec.scala
+++ b/src/test/scala/sbtghactions/GenerativePluginSpec.scala
@@ -594,7 +594,9 @@ class GenerativePluginSpec extends Specification {
           javas = javas),
         "")
 
-            results mustEqual s"""abc:
+      // Note: components: native-image is not included for Graalvm.Distribution
+      // because native-image is bundled by default in GraalVM for JDK 17+
+      results mustEqual s"""abc:
   name: How to get to...
   strategy:
     matrix:
@@ -609,7 +611,6 @@ class GenerativePluginSpec extends Specification {
       with:
         java-version: 17
         distribution: graalvm
-        components: native-image
         github-token: $${{ secrets.GITHUB_TOKEN }}
         cache: sbt"""
     }