diff --git a/cloudbuild-e2e-cloud-functions-gen2.yaml b/cloudbuild-e2e-cloud-functions-gen2.yaml
index d6d06b43..d81023ae 100644
--- a/cloudbuild-e2e-cloud-functions-gen2.yaml
+++ b/cloudbuild-e2e-cloud-functions-gen2.yaml
@@ -39,7 +39,7 @@ steps:
     args:
       - cloud-functions-gen2
       - --functionsource=/workspace/e2e-test-server/build/libs/function-source.zip
-      - --runtime=java11
+      - --runtime=java17
       - --entrypoint=com.google.cloud.opentelemetry.endtoend.CloudFunctionHandler
 
 logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
diff --git a/cloudbuild-e2e-cloud-run.yaml b/cloudbuild-e2e-cloud-run.yaml
index ef144330..df609056 100644
--- a/cloudbuild-e2e-cloud-run.yaml
+++ b/cloudbuild-e2e-cloud-run.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 steps:
   # Wait for the image to exist
-  - name: "docker"
+  - name: docker:28
     id: wait-for-image
     entrypoint: "sh"
     timeout: 3m
diff --git a/cloudbuild-e2e-gae.yaml b/cloudbuild-e2e-gae.yaml
index 8b7e3638..0f299582 100644
--- a/cloudbuild-e2e-gae.yaml
+++ b/cloudbuild-e2e-gae.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 steps:
   # Wait for the image to exist
-  - name: "docker"
+  - name: docker:28
     id: wait-for-image
     entrypoint: "sh"
     timeout: 3m
diff --git a/cloudbuild-e2e-gce.yaml b/cloudbuild-e2e-gce.yaml
index 661c9155..1fc255a4 100644
--- a/cloudbuild-e2e-gce.yaml
+++ b/cloudbuild-e2e-gce.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 steps:
   # Wait for the image to exist
-  - name: "docker"
+  - name: docker:28
     id: wait-for-image
     entrypoint: "sh"
     timeout: 3m
diff --git a/cloudbuild-e2e-gke.yaml b/cloudbuild-e2e-gke.yaml
index 4c617838..f3aa0d2c 100644
--- a/cloudbuild-e2e-gke.yaml
+++ b/cloudbuild-e2e-gke.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 steps:
   # Wait for the image to exist
-  - name: "docker"
+  - name: docker:28
     id: wait-for-image
     entrypoint: "sh"
     timeout: 3m
diff --git a/cloudbuild-e2e-image.yaml b/cloudbuild-e2e-image.yaml
index 745354c0..4843e277 100644
--- a/cloudbuild-e2e-image.yaml
+++ b/cloudbuild-e2e-image.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 steps:
-  - name: docker
+  - name: docker:28
     entrypoint: "sh"
     args:
       - -c
diff --git a/cloudbuild-e2e-local.yaml b/cloudbuild-e2e-local.yaml
index 14a8dec5..79d12f3a 100644
--- a/cloudbuild-e2e-local.yaml
+++ b/cloudbuild-e2e-local.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 steps:
   # Wait for the image to exist
-  - name: "docker"
+  - name: docker:28
     id: wait-for-image
     entrypoint: "sh"
     timeout: 3m
@@ -21,7 +21,7 @@ steps:
     args:
       - e2e-test-server/wait-for-image.sh
 
-  - name: "docker"
+  - name: docker:28
     id: pull-image
     args:
       - pull
diff --git a/e2e.Dockerfile b/e2e.Dockerfile
index ba27b26b..cfa3e87f 100644
--- a/e2e.Dockerfile
+++ b/e2e.Dockerfile
@@ -19,7 +19,7 @@ COPY --chown=gradle:gradle . /app/src
 WORKDIR /app/src
 RUN gradle :e2e-test-server:build
 
-FROM openjdk:11-jre-slim
+FROM openjdk:26-ea-11-jdk-slim
 COPY --from=builder /app/src/e2e-test-server/build/libs/*-all.jar /app/app.jar
 WORKDIR /app
 CMD java -jar app.jar