diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..c32e3f85c
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,19 @@
+---
+version: 2
+
+workflows:
+  version: 2
+  circleci:
+    jobs:
+      - bazel-opt
+
+jobs:
+  bazel-opt:
+    working_directory: /tmp/cirrus-ci-build
+    docker:
+      - image: toxchat/toktok-stack:latest-release
+
+    steps:
+      - checkout
+      - run: /src/workspace/tools/inject-repo toxic
+      - run: cd /src/workspace && bazel test -k //toxic/...
diff --git a/.cirrus.yml b/.cirrus.yml
index a5a7b76a6..c8ad7bf6d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,11 +1,11 @@
----
-bazel-opt_task:
-  container:
-    image: toxchat/toktok-stack:latest-release
-    cpu: 2
-    memory: 2G
-  configure_script:
-    - /src/workspace/tools/inject-repo toxic
-  test_all_script:
-    - cd /src/workspace && bazel test -k
-        //toxic/...
+# ---
+# bazel-opt_task:
+#   container:
+#     image: toxchat/toktok-stack:latest-release
+#     cpu: 2
+#     memory: 2G
+#   configure_script:
+#     - /src/workspace/tools/inject-repo toxic
+#   test_all_script:
+#     - cd /src/workspace && bazel test -k
+#         //toxic/...