diff --git a/.github/workflows/deploy-stage.yaml b/.github/workflows/deploy-stage.yaml
index ffbc502..8662c64 100644
--- a/.github/workflows/deploy-stage.yaml
+++ b/.github/workflows/deploy-stage.yaml
@@ -84,7 +84,7 @@ jobs:
         run: |
           mkdir -p release
           echo "Building binary file for target: ${{ matrix.goos }}${{ matrix.goarch }}"
-          env GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build -o ./release/ndc-elasticsearch-cli-${{ matrix.target }}${{ matrix.extension }}
+          env GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} CGO_ENABLED=0 go build -o ./release/ndc-elasticsearch-cli-${{ matrix.target }}${{ matrix.extension }}
           
       - uses: actions/upload-artifact@v4
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68acd94..ec768da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Configuration structure to be compatible with the latest connector version.
 
+### Fixed
+
+- Use static linking to resolve `glibc` version issues
+
 ## [0.1.1]
 
 ### Fixed