diff --git a/kokoro/github/ubuntu/cpu/build_versioned.sh b/kokoro/github/ubuntu/cpu/build_versioned.sh
index e2e6238c..378fa3d0 100644
--- a/kokoro/github/ubuntu/cpu/build_versioned.sh
+++ b/kokoro/github/ubuntu/cpu/build_versioned.sh
@@ -74,4 +74,4 @@ pip install dist/tensorflow_gnn-*.whl
 echo "Final packages after all pip commands:"
 pip list
 
-bazel test --test_env=TF_USE_LEGACY_KERAS --build_tag_filters="${tag_filters}" --test_tag_filters="${tag_filters}" --test_output=errors --verbose_failures=true --build_tests_only --define=no_tfgnn_py_deps=true --keep_going --experimental_repo_remote_exec //bazel_pip/tensorflow_gnn/...
+bazel test --test_env=TF_USE_LEGACY_KERAS --build_tag_filters="${tag_filters}" --test_tag_filters="${tag_filters}" --test_output=errors --verbose_failures=true --build_tests_only --define=no_tfgnn_py_deps=true --keep_going --experimental_repo_remote_exec //bazel_pip/tensorflow_gnn/...
\ No newline at end of file
diff --git a/kokoro/github/ubuntu/cpu/continuous.cfg b/kokoro/github/ubuntu/cpu/continuous.cfg
index 37bda92b..73a1d641 100644
--- a/kokoro/github/ubuntu/cpu/continuous.cfg
+++ b/kokoro/github/ubuntu/cpu/continuous.cfg
@@ -1,5 +1,9 @@
 build_file: "gnn/kokoro/github/ubuntu/cpu/build.sh"
 
+container_properties {
+  docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current"
+}
+
 env_vars: {
   key: "USE_BAZEL_VERSION"
   value: "7.4.1"  # TODO - b/390391579: Unpin once bazel 8 works.
diff --git a/kokoro/github/ubuntu/cpu/newest_stable/continuous.cfg b/kokoro/github/ubuntu/cpu/newest_stable/continuous.cfg
index 890a2916..9ca485cc 100644
--- a/kokoro/github/ubuntu/cpu/newest_stable/continuous.cfg
+++ b/kokoro/github/ubuntu/cpu/newest_stable/continuous.cfg
@@ -1,5 +1,9 @@
 build_file: "gnn/kokoro/github/ubuntu/cpu/build_versioned.sh"
 
+container_properties {
+  docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current"
+}
+
 env_vars: {
   key: "USE_BAZEL_VERSION"
   value: "7.4.1"  # TODO - b/390391579: Unpin once bazel 8 works.
diff --git a/kokoro/github/ubuntu/cpu/newest_stable/presubmit-test.cfg b/kokoro/github/ubuntu/cpu/newest_stable/presubmit-test.cfg
new file mode 100644
index 00000000..4d611591
--- /dev/null
+++ b/kokoro/github/ubuntu/cpu/newest_stable/presubmit-test.cfg
@@ -0,0 +1,29 @@
+build_file: "gnn/kokoro/github/ubuntu/cpu/build_versioned.sh"
+
+container_properties {
+  docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current"
+}
+
+env_vars: {
+  key: "USE_BAZEL_VERSION"
+  value: "5.2.0"  # TODO - b/390391579: Unpin once bazel 8 works.
+}
+env_vars: {
+  key: "PYTHON_VERSION"
+  value: "3.11"
+}
+env_vars: {
+  key: "TF_VERSION"
+  value: "2.20.*"
+}
+env_vars: {
+  key: "TF_USE_LEGACY_KERAS"
+  value: "1"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.log"
+    regex: "**/sponge_log.xml"
+  }
+}
\ No newline at end of file
diff --git a/kokoro/github/ubuntu/cpu/newest_stable/presubmit.cfg b/kokoro/github/ubuntu/cpu/newest_stable/presubmit.cfg
index 890a2916..9ca485cc 100644
--- a/kokoro/github/ubuntu/cpu/newest_stable/presubmit.cfg
+++ b/kokoro/github/ubuntu/cpu/newest_stable/presubmit.cfg
@@ -1,5 +1,9 @@
 build_file: "gnn/kokoro/github/ubuntu/cpu/build_versioned.sh"
 
+container_properties {
+  docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current"
+}
+
 env_vars: {
   key: "USE_BAZEL_VERSION"
   value: "7.4.1"  # TODO - b/390391579: Unpin once bazel 8 works.
diff --git a/kokoro/github/ubuntu/cpu/oldest/continuous.cfg b/kokoro/github/ubuntu/cpu/oldest/continuous.cfg
index aa98234d..4896bfb7 100644
--- a/kokoro/github/ubuntu/cpu/oldest/continuous.cfg
+++ b/kokoro/github/ubuntu/cpu/oldest/continuous.cfg
@@ -1,5 +1,9 @@
 build_file: "gnn/kokoro/github/ubuntu/cpu/build_versioned.sh"
 
+container_properties {
+  docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current"
+}
+
 env_vars: {
   key: "USE_BAZEL_VERSION"
   value: "7.4.1"  # TODO - b/390391579: Unpin once bazel 8 works.
diff --git a/kokoro/github/ubuntu/cpu/oldest/presubmit-test.cfg b/kokoro/github/ubuntu/cpu/oldest/presubmit-test.cfg
new file mode 100644
index 00000000..4896bfb7
--- /dev/null
+++ b/kokoro/github/ubuntu/cpu/oldest/presubmit-test.cfg
@@ -0,0 +1,33 @@
+build_file: "gnn/kokoro/github/ubuntu/cpu/build_versioned.sh"
+
+container_properties {
+  docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current"
+}
+
+env_vars: {
+  key: "USE_BAZEL_VERSION"
+  value: "7.4.1"  # TODO - b/390391579: Unpin once bazel 8 works.
+}
+env_vars: {
+  key: "PYTHON_VERSION"
+  value: "3.11"
+}
+env_vars: {
+  key: "TF_VERSION"
+  value: "2.12.*"
+}
+env_vars: {
+  key: "TF_USE_LEGACY_KERAS"
+  value: "0"
+}
+env_vars: {
+  key: "TAG_FILTERS"
+  value: ",-tf_at_least_2_13"
+}
+
+action {
+  define_artifacts {
+    regex: "**/sponge_log.log"
+    regex: "**/sponge_log.xml"
+  }
+}
\ No newline at end of file
diff --git a/kokoro/github/ubuntu/cpu/oldest/presubmit.cfg b/kokoro/github/ubuntu/cpu/oldest/presubmit.cfg
index aa98234d..4896bfb7 100644
--- a/kokoro/github/ubuntu/cpu/oldest/presubmit.cfg
+++ b/kokoro/github/ubuntu/cpu/oldest/presubmit.cfg
@@ -1,5 +1,9 @@
 build_file: "gnn/kokoro/github/ubuntu/cpu/build_versioned.sh"
 
+container_properties {
+  docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current"
+}
+
 env_vars: {
   key: "USE_BAZEL_VERSION"
   value: "7.4.1"  # TODO - b/390391579: Unpin once bazel 8 works.
diff --git a/kokoro/github/ubuntu/cpu/presubmit.cfg b/kokoro/github/ubuntu/cpu/presubmit.cfg
index 37bda92b..d96beb68 100644
--- a/kokoro/github/ubuntu/cpu/presubmit.cfg
+++ b/kokoro/github/ubuntu/cpu/presubmit.cfg
@@ -1,5 +1,9 @@
 build_file: "gnn/kokoro/github/ubuntu/cpu/build.sh"
 
+container_properties {
+  docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current"
+}
+
 env_vars: {
   key: "USE_BAZEL_VERSION"
   value: "7.4.1"  # TODO - b/390391579: Unpin once bazel 8 works.
@@ -14,4 +18,4 @@ action {
     regex: "**/sponge_log.log"
     regex: "**/sponge_log.xml"
   }
-}
\ No newline at end of file
+}