diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index a90e95593..2e9ffc249 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -12,26 +12,19 @@ x_defaults:
     - "//tools/..."
     test_targets:
     - "//src/..."
+    - "//src/tools/enforce_min_sdk_floor/..."
     - "-//src/java/com/example/sampleapp/..."
 
 tasks:
-  ubuntu1604:
-    <<: *common
-  ubuntu1804:
+  ubuntu2004:
     <<: *common
   macos:
     <<: *common
   macos_arm64:
     <<: *common
-  ubuntu1604_bzlmod:
-    name: Bzlmod ubuntu1604
-    platform: ubuntu1604
-    build_flags:
-    - "--enable_bzlmod"
-    <<: *common
-  ubuntu1804_bzlmod:
-    name: Bzlmod ubuntu1804
-    platform: ubuntu1804
+  ubuntu2004_bzlmod:
+    name: Bzlmod ubuntu2004
+    platform: ubuntu2004
     build_flags:
     - "--enable_bzlmod"
     <<: *common