diff --git a/.github/workflows/dev-build.yaml b/.github/workflows/dev-build.yaml
index e0f41f7cd..5005c90aa 100644
--- a/.github/workflows/dev-build.yaml
+++ b/.github/workflows/dev-build.yaml
@@ -42,7 +42,7 @@ jobs:
 
       - name: Build Everest
         run: |
-          CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make build build-cli
+          CGO_ENABLED=0 GOOS=linux GOARCH=amd64 make build
 
       - name: Setup docker build metadata
         uses: docker/metadata-action@v5
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 90cb608fd..d2c124188 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -428,10 +428,6 @@ jobs:
             type=raw,value=latest
             type=raw,value=${{ env.FLOATING_TAG }},enable=${{ env.IS_RC == 0 }}
 
-      - name: CLI - build binaries
-        run: |
-          make release-cli
-
       - name: Everest - build Everest image
         uses: docker/build-push-action@v6
         with:
@@ -461,6 +457,10 @@ jobs:
           push: true
           tags: ${{ steps.everest_meta.outputs.tags }}
 
+      - name: CLI - build binaries
+        run: |
+          make release-cli
+
       - name: CLI - create release with binaries
         uses: softprops/action-gh-release@v2
         with: