diff --git a/concourse/nokogiri-truffleruby.yml b/concourse/nokogiri-truffleruby.yml
index 1c9a1688d7..23b62920ac 100644
--- a/concourse/nokogiri-truffleruby.yml
+++ b/concourse/nokogiri-truffleruby.yml
@@ -6,10 +6,9 @@
 #! 2021-03-10 omit stable until the changes related to nokogiri are shipping in v22
 #! #@ all_truffleruby_versions.extend(truffleruby_versions["supported"])
 
-#@ compile_flag_combos = ["--disable-system-libraries --disable-static",
-#@                        "--disable-system-libraries --enable-static",
-#@                        "--enable-system-libraries",
-#@                       ]
+#@ compile_flag_combos = [["--disable-system-libraries", "--disable-static"],
+#@                        ["--disable-system-libraries", "--enable-static"],
+#@                        ["--enable-system-libraries"]]
 
 ---
 #@ def registry_image(image_repo, image_tag):
@@ -80,12 +79,14 @@ jobs:
         #@ if/end previous_job_name:
         passed: #@ [previous_job_name]
       #@ for compile_flags in compile_flag_combos:
-      - task: rake-test
+      #@ task_name = ["rake-test"]
+      #@ task_name.extend(compile_flags)
+      - task: #@ "_".join(task_name)
         config:
           "_": #@ template.replace(registry_image("flavorjones/nokogiri-test", "truffle-{}".format(ruby_version)))
           inputs: [{name: ci}, {name: nokogiri}]
           params:
-            COMPILE_FLAGS: #@ compile_flags
+            COMPILE_FLAGS: #@ " ".join(compile_flags)
           run: { path: ci/concourse/tasks/rake-test/run.sh }
       #@ end
 #@ previous_job_name = job_name
@@ -104,12 +105,14 @@ jobs:
         #@ if/end previous_job_name:
         passed: #@ [previous_job_name]
       #@ for compile_flags in compile_flag_combos:
-      - task: rake-test
+      #@ task_name = ["rake-test"]
+      #@ task_name.extend(compile_flags)
+      - task: #@ "_".join(task_name)
         config:
           "_": #@ template.replace(registry_image("flavorjones/nokogiri-test", "truffle-{}".format(ruby_version)))
           inputs: [{name: ci}, {name: nokogiri-pr, path: nokogiri}]
           params:
-            COMPILE_FLAGS: #@ compile_flags
+            COMPILE_FLAGS: #@ " ".join(compile_flags)
           run: { path: ci/concourse/tasks/rake-test/run.sh }
       #@ end
 #@ previous_job_name = job_name
diff --git a/concourse/nokogiri-truffleruby.yml.generated b/concourse/nokogiri-truffleruby.yml.generated
index ca15efd863..5f96dd71e1 100644
--- a/concourse/nokogiri-truffleruby.yml.generated
+++ b/concourse/nokogiri-truffleruby.yml.generated
@@ -19,7 +19,7 @@ jobs:
       platform: linux
       run:
         path: ci/concourse/tasks/rake-test/run.sh
-    task: rake-test
+    task: rake-test_--disable-system-libraries_--disable-static
   - config:
       image_resource:
         name: ""
@@ -35,7 +35,7 @@ jobs:
       platform: linux
       run:
         path: ci/concourse/tasks/rake-test/run.sh
-    task: rake-test
+    task: rake-test_--disable-system-libraries_--enable-static
   - config:
       image_resource:
         name: ""
@@ -51,7 +51,7 @@ jobs:
       platform: linux
       run:
         path: ci/concourse/tasks/rake-test/run.sh
-    task: rake-test
+    task: rake-test_--enable-system-libraries
   public: true
 - name: truffle-pr-nightly
   plan:
@@ -75,7 +75,7 @@ jobs:
       platform: linux
       run:
         path: ci/concourse/tasks/rake-test/run.sh
-    task: rake-test
+    task: rake-test_--disable-system-libraries_--disable-static
   - config:
       image_resource:
         name: ""
@@ -92,7 +92,7 @@ jobs:
       platform: linux
       run:
         path: ci/concourse/tasks/rake-test/run.sh
-    task: rake-test
+    task: rake-test_--disable-system-libraries_--enable-static
   - config:
       image_resource:
         name: ""
@@ -109,7 +109,7 @@ jobs:
       platform: linux
       run:
         path: ci/concourse/tasks/rake-test/run.sh
-    task: rake-test
+    task: rake-test_--enable-system-libraries
   public: true
 resource_types:
 - name: pull-request