diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 05389ffe98f4..08dd4fb7e7ce 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -24,8 +24,8 @@ global_job_config:
   prologue:
     commands:
       - checkout
-      - cache restore
-      - sem-version java 11
+      - . set-cp-java-version
+      - . cache-maven restore
 
 blocks:
   - name: Test
@@ -34,26 +34,18 @@ blocks:
       # don't run the tests on non-functional changes...
       when: "change_in('/', {exclude: ['/.deployed-versions/', '.github/']})"
     task:
-      env_vars:
-        - name: SEMAPHORE_AGENT_UPLOAD_JOB_LOGS
-          value: when-trimmed
       jobs:
         - name: Test
           commands:
-            - . ci-tools ci-update-version
-            - mvn -Dsurefire.rerunFailingTestsCount=3 -Dmaven.gitcommitid.nativegit=true -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode --no-transfer-progress clean install
-#            - mkdir -p thread-leak-tests
-#            - mv leaked_tests_summary.txt thread-leak-tests/
-#            - find . -path "*/thread-reports/**" -name "leakedTestStackDump-*.log" -not -path "thread-leak-tests/*" -exec mv {} thread-leak-tests/ \;
-#            - artifact push workflow thread-leak-tests
-#            - mkdir -p build-hang-files
-#            - find . -type f -name "build-timeout-java-thread-dump-*.log" -not -path "build-hang-files/*" -exec mv {} build-hang-files/ \;
-#            - artifact push workflow build-hang-files
+            - ci-tools ci-update-version
+            - mvn -Dmaven.gitcommitid.nativegit=true -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode --no-transfer-progress clean install
+            - . cache-maven store
       epilogue:
         always:
           commands:
             - . publish-test-results
             - artifact push workflow target/test-results
+            - artifact push workflow target
 
   - name: Release
     dependencies: ["Test"]
@@ -63,10 +55,8 @@ blocks:
       jobs:
         - name: Release
           commands:
-            - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-            - git fetch --unshallow || true
-            - . ci-tools ci-update-version
-            - . ci-tools ci-push-tag
+            - ci-tools ci-update-version
+            - ci-tools ci-push-tag
             - mvn -Ddocker.skip=true -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode -DaltDeploymentRepository=confluent-codeartifact-internal::default::https://confluent-519856050701.d.codeartifact.us-west-2.amazonaws.com/maven/maven-snapshots/
               -DrepositoryId=confluent-codeartifact-internal deploy -DskipTests
 
@@ -86,7 +76,8 @@ after_pipeline:
         commands:
           - checkout
           - sem-version java 11
-          - emit-sonarqube-data -a test-results
+          - artifact pull workflow target
+          - emit-sonarqube-data --run_only_sonar_scan
       - name: Trigger downstream projects
         commands:
           - >-