diff --git a/.cirrus.yml b/.cirrus.yml
index 86e200ea..ca509255 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,5 +1,5 @@
 ---
-bazel-release_task:
+bazel-opt_task:
   container:
     image: toxchat/toktok-stack:0.0.31-release
     cpu: 2
@@ -16,7 +16,7 @@ bazel-release_task:
         //c-toxcore/...
         -//c-toxcore/auto_tests:tcp_relay_test # TODO(robinlinden): Why does this pass locally but not in Cirrus?
 
-bazel-debug_task:
+bazel-dbg_task:
   container:
     image: toxchat/toktok-stack:0.0.31-debug
     cpu: 2
diff --git a/.github/settings.yml b/.github/settings.yml
index 0a941c80..d0b8090d 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -13,9 +13,9 @@ branches:
       required_status_checks:
         contexts:
           - "bazel-asan"
-          - "bazel-debug"
+          - "bazel-dbg"
           - "bazel-msan"
-          - "bazel-release"
+          - "bazel-opt"
           - "bazel-tsan"
           - "bazel-valgrind"
           - "build-bootstrapd-docker"