diff --git a/.github/workflows/all-post-commit-workflows.yaml b/.github/workflows/all-post-commit-workflows.yaml
index 14839d73779..09072086616 100644
--- a/.github/workflows/all-post-commit-workflows.yaml
+++ b/.github/workflows/all-post-commit-workflows.yaml
@@ -165,6 +165,7 @@ jobs:
     secrets: inherit
     with:
       os: ubuntu-22.04-amd64
+      build-docker: false
   tt-train-cpp-unit-tests:
     needs: build-artifact
     secrets: inherit
diff --git a/.github/workflows/code-analysis.yaml b/.github/workflows/code-analysis.yaml
index 28e502ba93a..39408b0b03a 100644
--- a/.github/workflows/code-analysis.yaml
+++ b/.github/workflows/code-analysis.yaml
@@ -11,6 +11,11 @@ on:
         required: false
         type: boolean
         default: false
+      build-docker:
+        required: false
+        type: boolean
+        default: true
+        description: "Build docker image"
   workflow_dispatch:
     inputs:
       os:
@@ -21,9 +26,15 @@ on:
         required: false
         type: boolean
         default: false
+      build-docker:
+        required: false
+        type: boolean
+        default: true
+        description: "Build docker image"
 
 jobs:
   build-docker-image:
+    if: ${{ inputs.build-docker == true }}
     uses: ./.github/workflows/build-docker-artifact.yaml
     secrets: inherit
     with:
@@ -32,6 +43,7 @@ jobs:
 
   clang-tidy:
     needs: build-docker-image
+    if: always()
     env:
       ARCH_NAME: wormhole_b0
     runs-on: