diff --git a/.github/actions/build_cli/action.yml b/.github/actions/build_cli/action.yml
index d0661abbc..5c617ff70 100644
--- a/.github/actions/build_cli/action.yml
+++ b/.github/actions/build_cli/action.yml
@@ -12,6 +12,10 @@ inputs:
     description: "Build CLI for this architecture. [amd64, arm64]"
     required: true
     default: "amd64"
+  enterpriseCLI:
+    description: "Build CLI with enterprise flag."
+    required: false
+    default: "false"
   cosignPublicKey:
     description: "Cosign public key"
     required: false
@@ -53,7 +57,12 @@ runs:
         echo "::group::Build CLI"
         mkdir -p build
         cd build
-        cmake -DCLI_BUILD_TAGS:STRING=enterprise ..
+        if [ ${{ inputs.enterpriseCLI }} == 'true' ]
+        then
+          cmake -DCLI_BUILD_TAGS:STRING=enterprise ..
+        else
+          cmake ..
+        fi
         GOOS=${{ inputs.targetOS }} GOARCH=${{ inputs.targetArch }} make -j`nproc` cli
         cp constellation constellation-${{ inputs.targetOS }}-${{ inputs.targetArch }}
         echo "$(pwd)" >> $GITHUB_PATH
diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml
index 7276ea4ab..4130f63d5 100644
--- a/.github/workflows/release-cli.yml
+++ b/.github/workflows/release-cli.yml
@@ -16,6 +16,7 @@ jobs:
         with:
           targetOS: linux
           targetArch: amd64
+          enterpriseCLI: true
           cosignPublicKey: ${{ secrets.COSIGN_PUBLIC_KEY }}
           cosignPrivateKey: ${{ secrets.COSIGN_PRIVATE_KEY }}
           cosignPassword: ${{ secrets.COSIGN_PASSWORD }}
@@ -25,6 +26,7 @@ jobs:
         with:
           targetOS: linux
           targetArch: arm64
+          enterpriseCLI: true
           cosignPublicKey: ${{ secrets.COSIGN_PUBLIC_KEY }}
           cosignPrivateKey: ${{ secrets.COSIGN_PRIVATE_KEY }}
           cosignPassword: ${{ secrets.COSIGN_PASSWORD }}
@@ -34,6 +36,7 @@ jobs:
         with:
           targetOS: darwin
           targetArch: amd64
+          enterpriseCLI: true
           cosignPublicKey: ${{ secrets.COSIGN_PUBLIC_KEY }}
           cosignPrivateKey: ${{ secrets.COSIGN_PRIVATE_KEY }}
           cosignPassword: ${{ secrets.COSIGN_PASSWORD }}
@@ -43,6 +46,7 @@ jobs:
         with:
           targetOS: darwin
           targetArch: arm64
+          enterpriseCLI: true
           cosignPublicKey: ${{ secrets.COSIGN_PUBLIC_KEY }}
           cosignPrivateKey: ${{ secrets.COSIGN_PRIVATE_KEY }}
           cosignPassword: ${{ secrets.COSIGN_PASSWORD }}