diff --git a/kokoro/ubuntu/build.sh b/kokoro/build.sh
similarity index 97%
rename from kokoro/ubuntu/build.sh
rename to kokoro/build.sh
index ecedad6..4c65e41 100755
--- a/kokoro/ubuntu/build.sh
+++ b/kokoro/build.sh
@@ -16,7 +16,7 @@
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 SCRIPT_PATH="${SCRIPT_DIR}/$(basename "${BASH_SOURCE[0]}")"
-ROOT_DIR="$(dirname $(dirname "${SCRIPT_DIR}"))"
+ROOT_DIR="$(dirname "${SCRIPT_DIR}")"
 
 REPO="${ROOT_DIR}/prebuilts/generic/repo/repo"
 
@@ -130,7 +130,7 @@
 then
 	TEST_ARGS+=(--run-all-qemu-cpus)
 fi
-./kokoro/ubuntu/test.sh ${TEST_ARGS[@]}
+./kokoro/test.sh ${TEST_ARGS[@]}
 
 #
 # Step 3: static analysis.
diff --git a/kokoro/public/continuous.cfg b/kokoro/public/continuous.cfg
new file mode 100644
index 0000000..cf31875
--- /dev/null
+++ b/kokoro/public/continuous.cfg
@@ -0,0 +1,14 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the continuous bash script in Git.
+build_file: "git/kokoro/build.sh"
+
+action {
+  define_artifacts {
+    regex: "git/out/**/kokoro_log/**/*sponge_log.log"
+    regex: "git/out/**/kokoro_log/**/*sponge_log.xml"
+    strip_prefix: "git"
+  }
+}
+
+timeout_mins: 10
diff --git a/kokoro/public/presubmit.cfg b/kokoro/public/presubmit.cfg
new file mode 100644
index 0000000..9bb14aa
--- /dev/null
+++ b/kokoro/public/presubmit.cfg
@@ -0,0 +1,14 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Location of the presubmit bash script in Git.
+build_file: "git/kokoro/build.sh"
+
+action {
+  define_artifacts {
+    regex: "git/out/**/kokoro_log/**/*sponge_log.log"
+    regex: "git/out/**/kokoro_log/**/*sponge_log.xml"
+    strip_prefix: "git"
+  }
+}
+
+timeout_mins: 10
diff --git a/kokoro/ubuntu/test.sh b/kokoro/test.sh
similarity index 100%
rename from kokoro/ubuntu/test.sh
rename to kokoro/test.sh
diff --git a/kokoro/ubuntu/continuous.cfg b/kokoro/ubuntu/continuous.cfg
index cacd607..e75edaf 100644
--- a/kokoro/ubuntu/continuous.cfg
+++ b/kokoro/ubuntu/continuous.cfg
@@ -1,7 +1,7 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
 # Location of the continuous bash script in Git.
-build_file: "hafnium/kokoro/ubuntu/build.sh"
+build_file: "hafnium/kokoro/build.sh"
 
 action {
   define_artifacts {
diff --git a/kokoro/ubuntu/presubmit.cfg b/kokoro/ubuntu/presubmit.cfg
index 7e56cce..482019c 100644
--- a/kokoro/ubuntu/presubmit.cfg
+++ b/kokoro/ubuntu/presubmit.cfg
@@ -1,7 +1,7 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
 # Location of the presubmit bash script in Git.
-build_file: "hafnium/kokoro/ubuntu/build.sh"
+build_file: "hafnium/kokoro/build.sh"
 
 action {
   define_artifacts {