diff --git a/cilium-1.16.yaml b/cilium-1.16.yaml
index 8f81b90568db..a74a3fdc5f88 100644
--- a/cilium-1.16.yaml
+++ b/cilium-1.16.yaml
@@ -1,8 +1,8 @@
 #nolint:valid-pipeline-git-checkout-commit,valid-pipeline-git-checkout-tag
 package:
   name: cilium-1.16
-  version: 1.16.3
-  epoch: 1
+  version: 1.16.4
+  epoch: 0
   description: Cilium is a networking, observability, and security solution with an eBPF-based dataplane
   copyright:
     - license: Apache-2.0
@@ -40,8 +40,8 @@ environment:
       - clang-17-dev
       - cmake
       - coreutils # for GNU install
-      # We need to stick to gcc 12 for now, envoy doesn't build with gcc >= 13
-      - gcc-12-default
+      # We need to stick to gcc 13 for now, envoy doesn't build with gcc >= 13
+      - gcc-13-default
       - git
       - go
       - grep
@@ -54,6 +54,7 @@ environment:
       - llvm17-dev
       - mpc-dev
       - openjdk-11
+      - openjdk-11-default-jvm
       - openssf-compiler-options
       - patch
       - python3-dev
@@ -62,14 +63,14 @@ environment:
 
 vars:
   # https://github.com/cilium/cilium/blob/v1.15.6/images/cilium/Dockerfile
-  CILIUM_PROXY_COMMIT: "0d05e48bfbb8c4737ec40d5781d970a550ed2bbd"
+  CILIUM_PROXY_COMMIT: "97edc2815e2c6a174d3d12e71731d54f5d32ea16"
 
 pipeline:
   - uses: git-checkout
     with:
       repository: https://github.com/cilium/cilium
       tag: v${{package.version}}
-      expected-commit: f221719170636b0e0da2c7b8227c18967a1201c8
+      expected-commit: 0380724290f01576aa053c2c2ad35532063c695e
 
   - uses: go/bump
     with:
@@ -109,7 +110,7 @@ pipeline:
       # Branch from https://github.com/cilium/cilium/blob/v1.15.5/images/cilium/Dockerfile
       # Note often the branch is updated with dependencies updates, no tags
       # See CILIUM_PROXY_COMMIT for anchor point
-      branch: v1.29
+      branch: v1.30
       depth: 1000
       destination: envoy
 
@@ -120,41 +121,41 @@ pipeline:
     with:
       patches: toolchains-paths.patch
 
-  - uses: patch
-    with:
-      patches: envoy-55b0fc45cfdc2c0df002690606853540cf794fab.patch
-
-  - runs: |
-      # Bazel errors out on toolchain stanza
-      sed -i '/$toolchain /d' go.mod
-      # Bazel errors out on go point release
-      sed -i 's|^\(go 1\.[0-9]*\)\.[0-9]*|\1|' go.mod
-
   - runs: |
       cd /home/build/envoy/proxylib
       make
       mkdir -p ${{targets.destdir}}/usr/lib
       cp -v libcilium.so ${{targets.destdir}}/usr/lib/libcilium.so
 
-      cd /home/build/envoy
-      # The Python interpreter complains about being run as root, there's a flag to pass to disable that warning.
+  - working-directory: envoy
+    runs: |
+      # Fix(build): The Python interpreter complains about being run as root, there's a flag to pass to disable that warning.
       sed -i 's/envoy_dependencies_extra()/envoy_dependencies_extra(ignore_root_user_error=True)/g' WORKSPACE
-      export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
+
       mkdir -p .cache/bazel/_bazel_root
 
       ./bazel/setup_clang.sh /usr
 
       mkdir -p ${{targets.destdir}}/usr/bin
+      bazel build --fission=no --config=clang \
+        --discard_analysis_cache \
+        --nokeep_state_after_build \
+        --notrack_incremental_state \
+        --conlyopt="-Wno-strict-prototypes" \
+        --verbose_failures -c opt //:cilium-envoy-starter
+
+      cp -v bazel-bin/cilium-envoy-starter ${{targets.destdir}}/usr/bin/cilium-envoy-starter
+
+  - working-directory: envoy
+    runs: |
+      bazel build --fission=no --config=clang \
+        --discard_analysis_cache \
+        --nokeep_state_after_build \
+        --notrack_incremental_state \
+        --conlyopt="-Wno-strict-prototypes" \
+        --verbose_failures -c opt //:cilium-envoy
 
-      for target in cilium-envoy-starter cilium-envoy; do
-        bazel build --fission=no --config=clang \
-          --discard_analysis_cache \
-          --nokeep_state_after_build \
-          --notrack_incremental_state \
-          --conlyopt="-Wno-strict-prototypes" \
-          --verbose_failures -c opt //:${target}
-        cp -v bazel-bin/${target} ${{targets.destdir}}/usr/bin/${target}
-      done
+      cp -v bazel-bin/cilium-envoy ${{targets.destdir}}/usr/bin/cilium-envoy
 
   - uses: strip