diff --git a/.github/workflows/build-envoy-image-ci.yaml b/.github/workflows/build-envoy-image-ci.yaml
index 33aabad6d..2ea4e0bd4 100644
--- a/.github/workflows/build-envoy-image-ci.yaml
+++ b/.github/workflows/build-envoy-image-ci.yaml
@@ -1,7 +1,8 @@
 name: CI Build & Push
 on:
-  pull_request_target:
-    types: [opened, synchronize, reopened]
+#  pull_request_target:
+#    types: [opened, synchronize, reopened]
+  pull_request: {}
 
 permissions:
   # To be able to access the repository with `actions/checkout`
diff --git a/.github/workflows/cilium-integration-tests.yaml b/.github/workflows/cilium-integration-tests.yaml
index e878b4fc6..ea010b371 100644
--- a/.github/workflows/cilium-integration-tests.yaml
+++ b/.github/workflows/cilium-integration-tests.yaml
@@ -27,7 +27,7 @@ env:
   # renovate: datasource=github-releases depName=kubernetes-sigs/kind
   KIND_VERSION: v0.30.0
   CILIUM_REPO_OWNER: cilium
-  CILIUM_REPO_REF: main
+  CILIUM_REPO_REF: pr/tammach/libatomic1
   CILIUM_CLI_REF: latest
   CURL_PARALLEL: ${{ vars.CURL_PARALLEL || 10 }}
 
diff --git a/Dockerfile b/Dockerfile
index bf95acb13..e255dbd9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -134,7 +134,7 @@ FROM docker.io/library/ubuntu:24.04@sha256:c35e29c9450151419d9448b0fd75374fec4ff
 LABEL maintainer="maintainer@cilium.io"
 # install ca-certificates package
 RUN apt-get update && apt-get upgrade -y \
-    && apt-get install --no-install-recommends -y ca-certificates \
+    && apt-get install --no-install-recommends -y ca-certificates libatomic1 \
     && apt-get autoremove -y && apt-get clean \
     && rm -rf /tmp/* /var/tmp/* \
     && rm -rf /var/lib/apt/lists/*
diff --git a/Dockerfile.builder b/Dockerfile.builder
index 54efacbce..2d7b3dee3 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -22,7 +22,7 @@ RUN apt-get update && \
       gcc-x86-64-linux-gnu g++-x86-64-linux-gnu libc6-dev-amd64-cross binutils-x86-64-linux-gnu \
       libc6-dev \
       # Envoy Build dependencies
-      autoconf automake cmake coreutils curl git libtool make ninja-build patch patchelf \
+      autoconf automake cmake coreutils curl git libtool make ninja-build patch patchelf libatomic1 \
 	python3 python-is-python3 unzip virtualenv wget zip \
       # Cilium-envoy build dependencies
       software-properties-common && \
diff --git a/ENVOY_VERSION b/ENVOY_VERSION
index 43d5e5dde..aaf3ed2bf 100644
--- a/ENVOY_VERSION
+++ b/ENVOY_VERSION
@@ -1 +1 @@
-envoy-1.35.3
+envoy-1.35.8
diff --git a/WORKSPACE b/WORKSPACE
index b456c2609..0b6524b95 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -12,8 +12,8 @@ ENVOY_REPO = "envoy"
 #
 # No other line in this file may have ENVOY_SHA followed by an equals sign!
 #
-# renovate: datasource=github-releases depName=envoyproxy/envoy digestVersion=v1.35.3
-ENVOY_SHA = "ff3fe7f0bb9e4ac6a283ea38bf9ee3f375530d56"
+# renovate: datasource=github-releases depName=envoyproxy/envoy digestVersion=v1.35.8
+ENVOY_SHA = "9a0cdcadabcb7baa2348afa1178e083f8d0fe2d7"
 
 # // clang-format off: unexpected @bazel_tools reference, please indirect via a definition in //bazel
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
@@ -43,6 +43,7 @@ git_repository(
         "@//patches:0004-thread_local-reset-slot-in-worker-threads-first.patch",
         "@//patches:0005-http-header-expose-attribute.patch",
         "@//patches:0006-build-Fix-arm-build-for-liburing.patch",
+        "@//patches:0007-Add-latomic-back-for-arm-build.patch",
     ],
     # // clang-format off: Envoy's format check: Only repository_locations.bzl may contains URL references
     remote = "https://github.com/envoyproxy/envoy.git",
diff --git a/patches/0007-Add-latomic-back-for-arm-build.patch b/patches/0007-Add-latomic-back-for-arm-build.patch
new file mode 100644
index 000000000..ead05c16f
--- /dev/null
+++ b/patches/0007-Add-latomic-back-for-arm-build.patch
@@ -0,0 +1,25 @@
+From 4dad6252057e395d8c87831419e6e05d55d323a6 Mon Sep 17 00:00:00 2001
+From: Tam Mach <sayboras@yahoo.com>
+Date: Fri, 12 Dec 2025 13:45:27 +1100
+Subject: [PATCH] Add latomic back for arm build
+
+---
+ bazel/v8.patch | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bazel/v8.patch b/bazel/v8.patch
+index 9b0cb2374f..512b22ebf4 100644
+--- a/bazel/v8.patch
++++ b/bazel/v8.patch
+@@ -284,7 +284,7 @@ index 39663c97df4..14b90ec6905 100644
+              ],
+              "@v8//bazel/config:is_macos": ["-pthread"],
+ -            "//conditions:default": ["-Wl,--no-as-needed -ldl -latomic -pthread"],
+-+            "//conditions:default": ["-Wl,--no-as-needed -ldl -pthread"],
+++            "//conditions:default": ["-Wl,--no-as-needed -ldl -latomic -pthread"],
+          }) + select({
+              ":should_add_rdynamic": ["-rdynamic"],
+              "//conditions:default": [],
+-- 
+2.43.0
+