diff --git a/build/debian/kokoro/continuous.cfg b/build/debian/kokoro/continuous.cfg
deleted file mode 100644
index 018812c..0000000
--- a/build/debian/kokoro/continuous.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- protobuffer -*-
-# proto-file: google3/devtools/kokoro/config/proto/build.proto
-# proto-message: BuildConfig
-
-# Location of the bash script. Should have value <git_on_borg_scm.name>/<path_from_repository_root>.
-# git_on_borg_scm.name is specified in the job configuration (next section).
-build_file: "avf/build/debian/kokoro/build.sh"
-container_properties {
-  docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2204/full:next"
-  docker_privileged: true
-  docker_user: "root"
-}
diff --git a/build/debian/kokoro/build.sh b/build/debian/kokoro/gcp_ubuntu_docker/build.sh
similarity index 100%
rename from build/debian/kokoro/build.sh
rename to build/debian/kokoro/gcp_ubuntu_docker/build.sh
diff --git a/build/debian/kokoro/gcp_ubuntu_docker/continuous.cfg b/build/debian/kokoro/gcp_ubuntu_docker/continuous.cfg
new file mode 100644
index 0000000..d92031e
--- /dev/null
+++ b/build/debian/kokoro/gcp_ubuntu_docker/continuous.cfg
@@ -0,0 +1,7 @@
+# -*- protobuffer -*-
+# proto-file: google3/devtools/kokoro/config/proto/build.proto
+# proto-message: BuildConfig
+
+# Location of the bash script. Should have value <git_on_borg_scm.name>/<path_from_repository_root>.
+# git_on_borg_scm.name is specified in the job configuration (next section).
+build_file: "avf/build/debian/kokoro/gcp_ubuntu_docker/build.sh"
diff --git a/build/debian/kokoro/gcp_ubuntu_docker/presubmit.cfg b/build/debian/kokoro/gcp_ubuntu_docker/presubmit.cfg
new file mode 100644
index 0000000..d92031e
--- /dev/null
+++ b/build/debian/kokoro/gcp_ubuntu_docker/presubmit.cfg
@@ -0,0 +1,7 @@
+# -*- protobuffer -*-
+# proto-file: google3/devtools/kokoro/config/proto/build.proto
+# proto-message: BuildConfig
+
+# Location of the bash script. Should have value <git_on_borg_scm.name>/<path_from_repository_root>.
+# git_on_borg_scm.name is specified in the job configuration (next section).
+build_file: "avf/build/debian/kokoro/gcp_ubuntu_docker/build.sh"