diff --git a/.circleci/config.yml b/.circleci/config.yml
index c517feddf..ebd6d6ffa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -108,7 +108,10 @@ jobs:
           kondukto: true
 workflows:
   build-and-test:
-    unless: << pipeline.parameters.release >>
+    unless:
+      or:
+        - << pipeline.parameters.release >>
+        - << pipeline.parameters.semgrep_scan >>
     jobs:
       - build-and-deploy:
           context: