diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5d9707f..f0eed02 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,7 +22,8 @@ jobs:
       matrix:
         os: [ ubuntu-latest ] # bash script only runs on ubuntu
         jdk-distribution: [ temurin ]
-        jdk-version: [ '11', '17' ]
+        jdk-version: [ '11', '17', '21' ]
+        batch-tck-ver: [ '2.1.5' ] # 2.1.1 Can't pass Java 21 tests, so remove it from testing.
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.jdk-distribution }} ${{ matrix.jdk-version }}
@@ -32,4 +33,4 @@ jobs:
           java-version: ${{ matrix.jdk-version }}
           cache: 'maven'
       - name: run setup script
-        run: ./run-tck.sh
+        run: SET_BATCH_TCK_VER=${{ matrix.batch-tck-ver }} ./run-tck.sh
diff --git a/run-tck.sh b/run-tck.sh
index 36a549c..0aabcbe 100755
--- a/run-tck.sh
+++ b/run-tck.sh
@@ -39,11 +39,15 @@ export JBOSS_HOME=$(pwd)/wildfly-${WFLY_VER}
 
 cp $JBERET_PORTING_DIR/target/jberet-tck-porting.jar $JBOSS_HOME/standalone/deployments/
 
-cp $JBERET_PORTING_DIR/src/main/resources/runners/sigtest/pom.xml $BATCH_TCK_DIR/runners/sigtest/pom.xml
-cp $JBERET_PORTING_DIR/src/main/resources/runners/se-classpath/pom.xml $BATCH_TCK_DIR/runners/se-classpath/pom.xml
-cp $JBERET_PORTING_DIR/src/main/resources/runners/platform-arquillian/pom.xml $BATCH_TCK_DIR/runners/platform-arquillian/pom.xml
+cp $JBERET_PORTING_DIR/src/main/resources/runners/sigtest/pom-parent-param.xml $BATCH_TCK_DIR/runners/sigtest/pom.xml
+cp $JBERET_PORTING_DIR/src/main/resources/runners/se-classpath/pom-parent-param.xml $BATCH_TCK_DIR/runners/se-classpath/pom.xml
+cp $JBERET_PORTING_DIR/src/main/resources/runners/platform-arquillian/pom-parent-param.xml $BATCH_TCK_DIR/runners/platform-arquillian/pom.xml
 cp $JBERET_PORTING_DIR/src/main/resources/runners/platform-arquillian/src/test/resources/arquillian.xml $BATCH_TCK_DIR/runners/platform-arquillian/src/test/resources/arquillian.xml
 
+sed -ie "s/BATCH_PARENT_VER/${BATCH_TCK_VER}/g" $BATCH_TCK_DIR/runners/sigtest/pom.xml
+sed -ie "s/BATCH_PARENT_VER/${BATCH_TCK_VER}/g" $BATCH_TCK_DIR/runners/se-classpath/pom.xml
+sed -ie "s/BATCH_PARENT_VER/${BATCH_TCK_VER}/g" $BATCH_TCK_DIR/runners/platform-arquillian/pom.xml
+
 # Run sigtest
 pushd $BATCH_TCK_DIR/runners/sigtest
 mvn install -Dversion.org.jberet.jberet-core=${jberet_ver}