diff --git a/kokoro/check-format/presubmit_check_format.cfg b/kokoro/check-format/continuous.cfg
similarity index 100%
rename from kokoro/check-format/presubmit_check_format.cfg
rename to kokoro/check-format/continuous.cfg
diff --git a/kokoro/ndk-build/presubmit.cfg b/kokoro/check-format/presubmit.cfg
similarity index 92%
rename from kokoro/ndk-build/presubmit.cfg
rename to kokoro/check-format/presubmit.cfg
index 233dbee64..9e6e5844d 100644
--- a/kokoro/ndk-build/presubmit.cfg
+++ b/kokoro/check-format/presubmit.cfg
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-build_file: "amber/kokoro/ndk-build/build.sh"
+build_file: "amber/kokoro/check-format/build.sh"
diff --git a/kokoro/ndk-build/continuous.cfg b/kokoro/license-check/continuous.cfg
similarity index 86%
rename from kokoro/ndk-build/continuous.cfg
rename to kokoro/license-check/continuous.cfg
index 233dbee64..37346633b 100644
--- a/kokoro/ndk-build/continuous.cfg
+++ b/kokoro/license-check/continuous.cfg
@@ -1,4 +1,4 @@
-# Copyright 2018 The Amber Authors.
+# Copyright 2020 The Amber Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-build_file: "amber/kokoro/ndk-build/build.sh"
+build_file: "amber/kokoro/license-check/build.sh"
diff --git a/tools/check_code_format.sh b/tools/check_code_format.sh
index 72a839838..9c5fd8444 100755
--- a/tools/check_code_format.sh
+++ b/tools/check_code_format.sh
@@ -25,7 +25,7 @@ if [ -z "${FILES_TO_CHECK}" ]; then
   exit 0
 fi
 
-FORMAT_DIFF=$(git diff -U0 main -- ${FILES_TO_CHECK} | python ./tools/clang-format-diff.py -p1 -style=file)
+FORMAT_DIFF=$(git diff -U0 main -- ${FILES_TO_CHECK} | python3 ./tools/clang-format-diff.py -p1 -style=file)
 
 if [ -z "${FORMAT_DIFF}" ]; then
   echo "All source code in PR properly formatted."
diff --git a/tools/check_language_test.py b/tools/check_language_test.py
index 8f20791ad..52ced2fe4 100755
--- a/tools/check_language_test.py
+++ b/tools/check_language_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2020 The Amber Authors. All rights reserved.
 #
diff --git a/tools/copyright.py b/tools/copyright.py
index ebf0a19d3..dd6850167 100755
--- a/tools/copyright.py
+++ b/tools/copyright.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2018 The Amber Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tools/update_build_version.py b/tools/update_build_version.py
index c3fad9767..5ee62d51f 100755
--- a/tools/update_build_version.py
+++ b/tools/update_build_version.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2018 The Amber Authors. All rights reserved.
 #
diff --git a/tools/update_vk_wrappers.py b/tools/update_vk_wrappers.py
index 063038007..c5a5d31e3 100755
--- a/tools/update_vk_wrappers.py
+++ b/tools/update_vk_wrappers.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2019 The Amber Authors. All rights reserved.
 #