diff --git a/jck/build.xml b/jck/build.xml
index ed5278537c..a21da2f6e5 100644
--- a/jck/build.xml
+++ b/jck/build.xml
@@ -365,7 +365,15 @@
 								<property name="JCK_VERSION_USED" value="jck11a" />
 							</then>
 							<else>
-								<property name="JCK_VERSION_USED" value="jck${JDK_VERSION}" />
+								<if>
+									<equals arg1="${JDK_VERSION}" arg2="17" />
+									<then>
+										<property name="JCK_VERSION_USED" value="jck17a" />
+									</then>
+									<else>
+										<property name="JCK_VERSION_USED" value="jck${JDK_VERSION}" />
+									</else>
+								</if>
 							</else>
 						</if>
 					</else>
diff --git a/jck/jck-semiauto-updater/jckupdater.sh b/jck/jck-semiauto-updater/jckupdater.sh
index f93a4ebd84..962472dfd9 100755
--- a/jck/jck-semiauto-updater/jckupdater.sh
+++ b/jck/jck-semiauto-updater/jckupdater.sh
@@ -93,6 +93,9 @@ setup(){
 	elif [[ $JCK_VERSION == "11" ]]; then
 		JCK=11a
 		JCK_FOLDER_SUFFIX="$JCK_VERSION"a
+	elif [[ $JCK_VERSION == "17" ]]; then
+		JCK=17a
+		JCK_FOLDER_SUFFIX="$JCK_VERSION"a
 	fi
 	echo "JCK_FOLDER_SUFFIX=" $JCK_FOLDER_SUFFIX
 	#check if given ARTIFACTORY_DOWNLOAD_URL is complete till JCK/tck to download material
diff --git a/jck/jck.mk b/jck/jck.mk
index 5c13187c9f..35c01ed85e 100644
--- a/jck/jck.mk
+++ b/jck/jck.mk
@@ -51,6 +51,9 @@ endif
 ifeq (11, $(JDK_VERSION))
    JCK_VERSION_NUMBER = 11a
 endif
+ifeq (17, $(JDK_VERSION))
+   JCK_VERSION_NUMBER = 17a
+endif
 
 JCK_VERSION = jck$(JCK_VERSION_NUMBER)
 
diff --git a/jck/jtrunner/config/jck17/compiler.jti b/jck/jtrunner/config/jck17a/compiler.jti
similarity index 93%
rename from jck/jtrunner/config/jck17/compiler.jti
rename to jck/jtrunner/config/jck17a/compiler.jti
index ec83946cff..8260562100 100644
--- a/jck/jtrunner/config/jck17/compiler.jti
+++ b/jck/jtrunner/config/jck17a/compiler.jti
@@ -1,10 +1,10 @@
 #JavaTest Harness Configuration Interview
-DESCRIPTION=JCK17 compiler template jti for STF automation
+DESCRIPTION=JCK17a compiler template jti for STF automation
 INTERVIEW=com.sun.jck.interview.JCKParameters
 NAME=jck_compiler
-# TESTSUITE example: /jck/jck17/JCK-compiler-17
+# TESTSUITE example: /jck/jck17a/JCK-compiler-17a
 TESTSUITE=will_be_set_by_test_automation_at_run_time
-# WORKDIR example: /home/user/JCK-compiler-17
+# WORKDIR example: /home/user/JCK-compiler-17a
 WORKDIR=will_be_set_by_test_automation_at_run_time
 jck.concurrency.concurrency=1
 jck.env.compiler.agent.networkClassLoading=No
@@ -51,7 +51,7 @@ jck.env.compiler.testRmic.otherOpts=
 jck.env.compiler.testRmic.outDirOpt=-d \#
 jck.env.compiler.testRmic.v11Option=-v1.1
 jck.env.compiler.testRmic.v12Option=-v1.2
-jck.env.description=JCK17 compiler template jti for STF automation
+jck.env.description=JCK17a compiler template jti for STF automation
 jck.env.envName=jck_compiler
 jck.env.moduleSystem.compilerOptions=compilerAddModsOptionTemplate\=--add-modules \#[,\#]\ncompilerModulePathOptionTemplate\=--module-path \#\ncompilerModuleSourcePathOptionTemplate\=--module-source-path \#\n
 jck.env.moduleSystem.vmOptions=vmModuleEntryOptionTemplate\=\nvmModulePathOptionTemplate\=\nvmAddModsOptionTemplate\=\n
@@ -73,7 +73,7 @@ jck.env.testPlatform.remoteNetworking=Remote network support
 jck.env.testPlatform.systemRoot=C\:\\windows
 jck.env.testPlatform.typecheckerSpecific=Yes
 jck.env.testPlatform.useAgent=No
-# jck.excludeList.customFiles example: /jck/jck17/excludes/jck17.jtx\n/jck/jck17/excludes/jck17.kfl
+# jck.excludeList.customFiles example: /jck/jck17a/excludes/jck17a.jtx\n/jck/jck17a/excludes/jck17a.kfl
 jck.excludeList.customFiles=will_be_set_by_test_automation_at_run_time
 jck.excludeList.excludeListType=custom
 jck.excludeList.latestAutoCheck=No
diff --git a/jck/jtrunner/config/jck17/runtime.jti b/jck/jtrunner/config/jck17a/runtime.jti
similarity index 96%
rename from jck/jtrunner/config/jck17/runtime.jti
rename to jck/jtrunner/config/jck17a/runtime.jti
index 1d6a323052..7cea673048 100644
--- a/jck/jtrunner/config/jck17/runtime.jti
+++ b/jck/jtrunner/config/jck17a/runtime.jti
@@ -1,15 +1,15 @@
 #JavaTest Harness Configuration Interview
-DESCRIPTION=JCK17 runtime template jti for STF automation
+DESCRIPTION=JCK17a runtime template jti for STF automation
 INTERVIEW=com.sun.jck.interview.JCKParameters
 LOCALE=en_US
 NAME=jck_runtime
 QUESTION=jck.end
-# TESTSUITE example: /jck/jck17/JCK-runtime-17
+# TESTSUITE example: /jck/jck17a/JCK-runtime-17a
 TESTSUITE=will_be_set_by_test_automation_at_run_time
-# WORKDIR example: /home/user/JCK-runtime-17
+# WORKDIR example: /home/user/JCK-runtime-17a
 WORKDIR=will_be_set_by_test_automation_at_run_time
 jck.concurrency.concurrency=1
-jck.env.description=JCK17 runtime template jti for STF automation
+jck.env.description=JCK17a runtime template jti for STF automation
 jck.env.envName=jck_runtime
 jck.env.moduleSystem.compilerOptions=compilerAddModsOptionTemplate\=\ncompilerModulePathOptionTemplate\=\ncompilerModuleSourcePathOptionTemplate\=\n
 jck.env.moduleSystem.vmOptions=vmModuleEntryOptionTemplate\=--module \#\nvmModulePathOptionTemplate\=--module-path \#\nvmAddModsOptionTemplate\=--add-modules \#[,\#]\n
@@ -117,7 +117,7 @@ jck.env.runtime.testExecute.cmdAsFile=will_be_set_by_test_automation_at_run_time
 jck.env.runtime.testExecute.jarExecution=Yes
 jck.env.runtime.testExecute.jarExecutionOpt=-jar \#
 jck.env.runtime.testExecute.jmx=Yes
-# jck.env.runtime.testExecute.jmxResourcePathFileValue example: /jck/jck17/natives/linux_x86-64
+# jck.env.runtime.testExecute.jmxResourcePathFileValue example: /jck/jck17a/natives/linux_x86-64
 jck.env.runtime.testExecute.jmxResourcePathFileValue=will_be_set_by_test_automation_at_run_time
 jck.env.runtime.testExecute.jni=Yes
 jck.env.runtime.testExecute.jvmti=Yes
@@ -128,7 +128,7 @@ jck.env.runtime.testExecute.libPath=environment variable
 # jck.env.runtime.testExecute.libPathEnv example: LD_LIBRARY_PATH
 jck.env.runtime.testExecute.libPathEnv=will_be_set_by_test_automation_at_run_time
 jck.env.runtime.testExecute.moduleOptions=Yes
-# jck.env.runtime.testExecute.nativeLibPathFileValue example: /jck/jck17/natives/linux_x86-64
+# jck.env.runtime.testExecute.nativeLibPathFileValue example: /jck/jck17a/natives/linux_x86-64
 jck.env.runtime.testExecute.nativeLibPathFileValue=will_be_set_by_test_automation_at_run_time
 jck.env.runtime.testExecute.nativeLibrariesLocation=Yes
 jck.env.runtime.testExecute.nativeLibsLinkage=dynamic
@@ -162,7 +162,7 @@ jck.env.testPlatform.remoteNetworking=Remote network support
 jck.env.testPlatform.systemRoot=will_be_set_by_test_automation_at_run_time
 jck.env.testPlatform.typecheckerSpecific=Yes
 jck.env.testPlatform.useAgent=No
-# jck.excludeList.customFiles example: /jck/jck17/excludes/jck17.jtx\n/jck/jck17/excludes/jck17.kfl
+# jck.excludeList.customFiles example: /jck/jck17a/excludes/jck17a.jtx\n/jck/jck17a/excludes/jck17a.kfl
 jck.excludeList.customFiles=will_be_set_by_test_automation_at_run_time
 jck.excludeList.excludeListType=custom
 jck.excludeList.latestAutoCheck=No