diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
index ae2a5967c..159b79cf7 100644
--- a/.github/workflows/ci_cd.yml
+++ b/.github/workflows/ci_cd.yml
@@ -107,33 +107,28 @@ jobs:
           retention-days: 7
 
   smoke-tests:
-    if: ${{ !(github.event_name == 'push' && contains(github.ref, 'refs/tags')) }}
     name: Build and Smoke tests
     runs-on: ${{ matrix.os }}
     needs: [style]
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        python-version: ['3.10']
-    steps:
-      - name: Build wheelhouse and perform smoke test
-        uses: ansys/actions/build-wheelhouse@v5
-        with:
-          library-name: ${{ env.PACKAGE_NAME }}
-          operating-system: ${{ matrix.os }}
-          python-version: ${{ matrix.python-version }}
-
-  smoke-tests-release:
-    if: ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags') }}
-    name: Build and Smoke tests for release
-    runs-on: ${{ matrix.os }}
-    needs: [style]
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         python-version: ['3.9', '3.10', '3.11', '3.12']
+        should-release:
+          - ${{ github.event_name == 'push' && contains(github.ref, 'refs/tags') }}
+        exclude:
+          - should-release: false
+            os: macos-latest
+          - should-release: false
+            os: windows-latest
+          - should-release: false
+            python-version: '3.9'
+          - should-release: false
+            python-version: '3.11'
+          - should-release: false
+            python-version: '3.12'
+
     steps:
       - name: Build wheelhouse and perform smoke test
         uses: ansys/actions/build-wheelhouse@v5