diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index cefb94a70..084b07b25 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -75,11 +75,6 @@ graalvm)
     mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
     RETURN_CODE=$?
     ;;
-graalvm17)
-    # Run Unit and Integration Tests with Native Image
-    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
-    RETURN_CODE=$?
-    ;;
 samples)
     SAMPLES_DIR=samples
     # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
diff --git a/.kokoro/continuous/graalvm-native.cfg b/.kokoro/continuous/graalvm-native-a.cfg
similarity index 98%
rename from .kokoro/continuous/graalvm-native.cfg
rename to .kokoro/continuous/graalvm-native-a.cfg
index 1a6cc8cce..6ae3c9e81 100644
--- a/.kokoro/continuous/graalvm-native.cfg
+++ b/.kokoro/continuous/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.2"
 }
 
 env_vars: {
diff --git a/.kokoro/continuous/graalvm-native-17.cfg b/.kokoro/continuous/graalvm-native-b.cfg
similarity index 95%
rename from .kokoro/continuous/graalvm-native-17.cfg
rename to .kokoro/continuous/graalvm-native-b.cfg
index 7d68556e9..821f86cca 100644
--- a/.kokoro/continuous/graalvm-native-17.cfg
+++ b/.kokoro/continuous/graalvm-native-b.cfg
@@ -3,12 +3,12 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.2"
 }
 
 env_vars: {
   key: "JOB_TYPE"
-  value: "graalvm17"
+  value: "graalvm"
 }
 
 # TODO: remove this after we've migrated all tests and scripts
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/continuous/graalvm-native-c.cfg
similarity index 90%
rename from .kokoro/presubmit/graalvm-native.cfg
rename to .kokoro/continuous/graalvm-native-c.cfg
index 4477760a6..16e3d4ca4 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/continuous/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.46.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.46.2"
 }
 
 env_vars: {
@@ -31,3 +31,8 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "java-it-service-account"
 }
+
+env_vars: {
+  key: "ENABLE_FLAKYBOT"
+  value: "true"
+}
\ No newline at end of file
diff --git a/.kokoro/nightly/graalvm-native-17.cfg b/.kokoro/nightly/graalvm-native-17.cfg
deleted file mode 100644
index 15ed86292..000000000
--- a/.kokoro/nightly/graalvm-native-17.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "nightly-graalvm17"
-}
-
-# TODO: remove this after we've migrated all tests and scripts
-env_vars: {
-  key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "GOOGLE_CLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "ENABLE_FLAKYBOT"
-  value: "true"
-}
-
-env_vars: {
-  key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-it-service-account"
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "java-it-service-account"
-}
\ No newline at end of file
diff --git a/.kokoro/nightly/graalvm-native.cfg b/.kokoro/nightly/graalvm-native.cfg
deleted file mode 100644
index 57c1e3511..000000000
--- a/.kokoro/nightly/graalvm-native.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm"
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "nightly-graalvm"
-}
-
-# TODO: remove this after we've migrated all tests and scripts
-env_vars: {
-  key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "GOOGLE_CLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "ENABLE_FLAKYBOT"
-  value: "true"
-}
-
-env_vars: {
-  key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-it-service-account"
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "java-it-service-account"
-}
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
deleted file mode 100644
index fd82cff87..000000000
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ /dev/null
@@ -1,33 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.46.0""
-}
-
-env_vars: {
-  key: "JOB_TYPE"
-  value: "graalvm17"
-}
-
-# TODO: remove this after we've migrated all tests and scripts
-env_vars: {
-  key: "GCLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "GOOGLE_CLOUD_PROJECT"
-  value: "gcloud-devel"
-}
-
-env_vars: {
-  key: "GOOGLE_APPLICATION_CREDENTIALS"
-  value: "secret_manager/java-it-service-account"
-}
-
-env_vars: {
-  key: "SECRET_MANAGER_KEYS"
-  value: "java-it-service-account"
-}
\ No newline at end of file