diff --git a/.cirrus.yml b/.cirrus.yml
index ab863125de..65d6554f70 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -1,15 +1,16 @@
 ---
 cirrus-ci_task:
   container:
-    image: toxchat/toktok-stack:0.0.7
+    image: toxchat/toktok-stack:0.0.10
     cpu: 2
     memory: 2G
   configure_script:
     - /src/workspace/tools/inject-repo c-toxcore
   test_all_script:
     - bazel test -k
-        --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
-        --config=ci
-        --config=docker
-        --config=release
-        //c-toxcore/...
+      --build_tag_filters=-haskell
+      --test_tag_filters=-haskell
+      --remote_download_minimal
+      --config=ci
+      --config=release
+      //c-toxcore/...
diff --git a/toxav/BUILD.bazel b/toxav/BUILD.bazel
index 036bde3fce..d7e6b6e9c4 100644
--- a/toxav/BUILD.bazel
+++ b/toxav/BUILD.bazel
@@ -139,5 +139,5 @@ sh_test(
     srcs = ["//hs-tokstyle/tools:check-cimple"],
     args = ["$(location %s)" % f for f in CIMPLE_SRCS],
     data = CIMPLE_SRCS,
-    tags = ["manual"],
+    tags = ["haskell"],
 )
diff --git a/toxcore/BUILD.bazel b/toxcore/BUILD.bazel
index af23a2b2fb..0fdfe0aec0 100644
--- a/toxcore/BUILD.bazel
+++ b/toxcore/BUILD.bazel
@@ -33,6 +33,7 @@ cc_test(
     name = "crypto_core_test",
     size = "small",
     srcs = ["crypto_core_test.cc"],
+    flaky = True,
     deps = [
         ":crypto_core",
         "@com_google_googletest//:gtest_main",
@@ -296,5 +297,5 @@ sh_test(
     srcs = ["//hs-tokstyle/tools:check-cimple"],
     args = ["$(location %s)" % f for f in CIMPLE_SRCS],
     data = CIMPLE_SRCS,
-    tags = ["manual"],
+    tags = ["haskell"],
 )