diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 288677fd0b..a7ab0ed160 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,59 +13,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  api-verification:
-    name: API Verification
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-      - name: Set up Go
-        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5
-        with:
-          # NOTE(chrisgacsal): Use actions/cache for caching Go dependency and build caches
-          # as if provides better flexibility like setting the cache key which reduces cache misses significantly.
-          cache: false
-          go-version-file: '.go-version'
-
-      - name: Setup Go caching
-        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ github.ref_name }}-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-${{ github.ref_name }}-
-            ${{ runner.os }}-go-${{ github.event.repository.default_branch }}-
-
-      - name: Generate API code
-        run: make gen-api
-
-      # This step will evaluate the repo status and exit if found changes
-      # This should detect if the most up-to-date generated API code was pushed
-      - name: Changes validation
-        run: |
-          [[ -z "$(git status --porcelain)" ]] || exit 1
-
-  helm-docs-verification:
-    name: Helm Docs Verification
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-      - name: Generate Helm Docs
-        run: make gen-helm-docs
-
-      # This step will evaluate the repo status and exit if found changes
-      # This should detect if the most up-to-date generated helm docs were pushed
-      - name: Changes validation
-        run: |
-          [[ -z "$(git status --porcelain)" ]] || exit 1
-
   verification:
-    needs: api-verification
     name: Verification
     uses: ./.github/workflows/reusable-verification.yml
     secrets: inherit
diff --git a/.github/workflows/reusable-verification.yml b/.github/workflows/reusable-verification.yml
index 6b3382dfb0..ac43d7b6df 100644
--- a/.github/workflows/reusable-verification.yml
+++ b/.github/workflows/reusable-verification.yml
@@ -60,7 +60,9 @@ jobs:
 
       - name: Run linters for Helm
         run: |
+          make gen-helm-docs
           make lint-helm
+          [[ -z "$(git status --porcelain)" ]] || exit 1
 
       - name: Run linters for Azure/Bicep
         run: |
@@ -105,6 +107,11 @@ jobs:
             ${{ runner.os }}-go-${{ github.ref_name }}-
             ${{ runner.os }}-go-${{ github.event.repository.default_branch }}-
 
+      - name: Verify APIs
+        run: |
+          make gen-api
+          [[ -z "$(git status --porcelain)" ]] || exit 1
+
       - name: Verify go modules
         run: |
           make gomod-list