diff --git a/CHANGELOG.md b/CHANGELOG.md
index 331f21209..3954d22b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - (Maintenance) Update Dependencies
 - (Feature) Backup Retry Until and BackupPolicy Until Propagation feature
 - (Bugfix) Improve Profile Tolerations Merge
+- (Maintenance) Update Envoy to v1.32.5
 
 ## [1.2.47](https://github.com/arangodb/kube-arangodb/tree/1.2.47) (2025-03-28)
 - (Bugfix) Use Profile Annotations
diff --git a/Dockerfile b/Dockerfile
index 704847ef8..a96016066 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 ARG IMAGE=ubuntu:24.04
-ARG ENVOY_IMAGE=envoyproxy/envoy:v1.32.1
+ARG ENVOY_IMAGE
 
 # Build Steps
 
diff --git a/Dockerfile.ubi b/Dockerfile.ubi
index e10bbaa3e..a5312b1f4 100644
--- a/Dockerfile.ubi
+++ b/Dockerfile.ubi
@@ -1,5 +1,5 @@
 ARG IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.4
-ARG ENVOY_IMAGE=envoyproxy/envoy:v1.31.0
+ARG ENVOY_IMAGE
 
 # Build Steps
 
diff --git a/Makefile b/Makefile
index d043c940b..67a1affdd 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,8 @@ endif
 KUBERNETES_VERSION_MINOR:=31
 KUBERNETES_VERSION_PATCH:=8
 
+ENVOY_IMAGE=envoyproxy/envoy:v1.32.5
+
 PROJECT := arangodb_operator
 SCRIPTDIR := $(shell pwd)
 ROOTDIR := $(shell cd $(SCRIPTDIR) && pwd)
@@ -471,11 +473,11 @@ $(BIN): $(VBIN_LINUX_AMD64) $(VBIN_OPS_LINUX_AMD64) $(VBIN_INT_LINUX_AMD64) $(VB
 .PHONY: docker
 docker: clean check-vars $(VBIN_LINUX_AMD64) $(VBIN_LINUX_ARM64)
 ifdef PUSHIMAGES
-	docker buildx build --no-cache -f $(DOCKERFILE) --build-arg GOVERSION=$(GOVERSION) --build-arg DISTRIBUTION=$(DISTRIBUTION) \
+	docker buildx build --no-cache -f $(DOCKERFILE) --build-arg "ENVOY_IMAGE=$(ENVOY_IMAGE)" --build-arg GOVERSION=$(GOVERSION) --build-arg DISTRIBUTION=$(DISTRIBUTION) \
 		--build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "RELEASE_MODE=$(RELEASE_MODE)" --build-arg "BUILD_SKIP_UPDATE=${BUILD_SKIP_UPDATE}" \
 		--platform linux/amd64,linux/arm64 --push -t $(OPERATORIMAGE) .
 else
-	docker buildx build --no-cache -f $(DOCKERFILE) --build-arg GOVERSION=$(GOVERSION) --build-arg DISTRIBUTION=$(DISTRIBUTION) \
+	docker buildx build --no-cache -f $(DOCKERFILE) --build-arg "ENVOY_IMAGE=$(ENVOY_IMAGE)" --build-arg GOVERSION=$(GOVERSION) --build-arg DISTRIBUTION=$(DISTRIBUTION) \
 		--build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "RELEASE_MODE=$(RELEASE_MODE)" --build-arg "BUILD_SKIP_UPDATE=${BUILD_SKIP_UPDATE}" \
 		--platform linux/amd64,linux/arm64 -t $(OPERATORIMAGE) .
 endif
@@ -483,12 +485,12 @@ endif
 .PHONY: docker-ubi
 docker-ubi: check-vars $(VBIN_LINUX_AMD64)
 ifdef PUSHIMAGES
-	docker buildx build --no-cache -f "$(DOCKERFILE).ubi" --build-arg GOVERSION=$(GOVERSION) --build-arg DISTRIBUTION=$(DISTRIBUTION) \
+	docker buildx build --no-cache -f "$(DOCKERFILE).ubi" --build-arg "ENVOY_IMAGE=$(ENVOY_IMAGE)" --build-arg GOVERSION=$(GOVERSION) --build-arg DISTRIBUTION=$(DISTRIBUTION) \
 		--build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "RELEASE_MODE=$(RELEASE_MODE)" \
 		--build-arg "IMAGE=$(BASEUBIIMAGE)" \
 		--platform linux/amd64 --push -t $(OPERATORUBIIMAGE) .
 else
-	docker buildx build --no-cache -f "$(DOCKERFILE).ubi" --build-arg GOVERSION=$(GOVERSION) --build-arg DISTRIBUTION=$(DISTRIBUTION) \
+	docker buildx build --no-cache -f "$(DOCKERFILE).ubi" --build-arg "ENVOY_IMAGE=$(ENVOY_IMAGE)" --build-arg GOVERSION=$(GOVERSION) --build-arg DISTRIBUTION=$(DISTRIBUTION) \
 		--build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "RELEASE_MODE=$(RELEASE_MODE)" \
 		--build-arg "IMAGE=$(BASEUBIIMAGE)" \
 		--platform linux/amd64 -t $(OPERATORUBIIMAGE) .