diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 5fb07b324129..fe7c3474a574 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -17,9 +17,13 @@ execution_time_limit:
   hours: 6
 
 queue:
-  - when: "branch != 'master' and branch !~ '[0-9]+\\.[0-9]+\\.x'"
+  - when: "branch != 'master' and branch !~ '[0-9]+\\.[0-9]+\\.x' and branch = 'pipeline-opt'"
     processing: parallel
 
+auto_cancel:
+  queued:
+    when: "branch != 'master'"
+
 global_job_config:
   prologue:
     commands:
@@ -27,6 +31,7 @@ global_job_config:
       - . set-cp-java-version
       - . cache-maven restore
 
+
 blocks:
   - name: Test
     dependencies: []
@@ -47,6 +52,9 @@ blocks:
             - artifact push workflow target/test-results
             - artifact push workflow target
 
+
+
+
   - name: Release
     dependencies: ["Test"]
     run: