diff --git a/Dockerfile b/Dockerfile
index 37f99e4..7359448 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -51,8 +51,7 @@ COPY --from=eclipse-temurin:11-jdk-noble /opt/java/openjdk /usr/lib/jvm/11
 COPY --from=eclipse-temurin:17-jdk-noble /opt/java/openjdk /usr/lib/jvm/17
 COPY --from=eclipse-temurin:21-jdk-noble /opt/java/openjdk /usr/lib/jvm/21
 COPY --from=eclipse-temurin:25-jdk-noble /opt/java/openjdk /usr/lib/jvm/25
-# TODO: Update once 26 is officially released. GA ETA is Mar 17 2026.
-COPY --from=openjdk:26-rc-jdk-bookworm /usr/local/openjdk-26 /usr/lib/jvm/26
+COPY --from=eclipse-temurin:26-jdk-noble /opt/java/openjdk /usr/lib/jvm/26
 COPY --from=temurin-latest /opt/java/openjdk /usr/lib/jvm/${LATEST_VERSION}
 
 COPY --from=azul/zulu-openjdk:7 /usr/lib/jvm/zulu7 /usr/lib/jvm/7
diff --git a/build b/build
index 9ecad3d..c09c6cb 100755
--- a/build
+++ b/build
@@ -3,7 +3,7 @@ set -eu
 
 readonly IMAGE_NAME="ghcr.io/datadog/dd-trace-java-docker-build"
 
-readonly BASE_VARIANTS=(8 11 17 21 25 26 tip) # TODO: Remove 26 after officially released (tip will then refer to 26)
+readonly BASE_VARIANTS=(8 11 17 21 25 tip)
 
 readonly VARIANTS=(
     7