diff --git a/README.md b/README.md
index 4d8ac55a78..e11a573a58 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ The following table lists the software versions NGINX Gateway Fabric supports. O
 
 | NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus | NGINX Agent |
 |----------------------|-------------|------------|-----------|------------|-------------|
-| Edge                 | 1.5.1       | 1.31+      | 1.29.8    | R36        | v3.9.0      |
+| Edge                 | 1.5.1       | 1.31+      | 1.30.0    | R36        | v3.9.0      |
 | 2.5.1                | 1.5.1       | 1.31+      | 1.29.7    | R36        | v3.8.0      |
 | 2.4.2                | 1.4.1       | 1.25+      | 1.29.5    | R36        | v3.7.1      |
 | 2.3.0                | 1.4.1       | 1.25+      | 1.29.3    | R36        | v3.6.0      |
diff --git a/build/Dockerfile.nginx b/build/Dockerfile.nginx
index 2b59ee6983..afdb3bab26 100644
--- a/build/Dockerfile.nginx
+++ b/build/Dockerfile.nginx
@@ -4,7 +4,7 @@ FROM scratch AS nginx-files
 # the following links can be replaced with local files if needed, i.e. ADD --chown=101:1001 <local_file> <container_file>
 ADD --link --chown=101:1001 https://cs.nginx.com/static/keys/nginx_signing.rsa.pub nginx_signing.rsa.pub
 
-FROM nginx:1.29.8-alpine-otel
+FROM nginx:1.30.0-alpine-otel
 
 # renovate: datasource=github-tags depName=nginx/agent
 ARG NGINX_AGENT_VERSION=v3.9.0
@@ -16,9 +16,6 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk
     printf "%s\n" "https://packages.nginx.org/nginx-agent/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
     && apk add --no-cache nginx-agent=${NGINX_AGENT_VERSION#v}
 
-# Upgrade for CVEs 2026-33416 and 2026-33636
-RUN apk update && apk upgrade --no-cache libpng
-
 RUN apk add --no-cache bash \
     && mkdir -p /usr/lib/nginx/modules \
     # forward request and error logs to docker log collector