diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 444a52a451e..ba27013b989 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -26,6 +26,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Build Envoy
+        run: |
+          alias proxy-run='./common/scripts/run.sh env CC=clang CXX=clang++'
+          proxy-run bazel build --config=libc++ //:envoy
+          proxy-run cp bazel-bin/envoy out/envoy
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
diff --git a/Dockerfile b/Dockerfile
index a303f7992ea..de7b36d57a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,3 @@
-FROM gcr.io/istio-testing/build-tools-proxy:release-1.24-latest AS builder
-
-WORKDIR /work/
-
-COPY . /work/
-
-RUN make build_envoy
-
 FROM istio/proxyv2:1.24.2
 
-COPY --from=builder /work/out/linux_amd64/envoy /usr/local/bin/
+COPY ./out/envoy /usr/local/bin/