diff --git a/.cloudbuild/samples_build.yaml b/.cloudbuild/samples_build.yaml
index 1c3ed5366..2d4a498e3 100644
--- a/.cloudbuild/samples_build.yaml
+++ b/.cloudbuild/samples_build.yaml
@@ -1,17 +1,31 @@
 steps:
-- name: gcr.io/cloud-devrel-kokoro-resources/java8
+- name: gcr.io/cloud-devrel-public-resources/java8
   entrypoint: ls
   args: [
     '-alt',
   ]
-- name: gcr.io/cloud-devrel-kokoro-resources/java8
+- name: gcr.io/cloud-devrel-public-resources/java8
+  entrypoint: curl
+  args: [
+    '--header',
+    'Metadata-Flavor: Google',
+    'http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/email'
+  ]
+- name: gcr.io/cloud-devrel-public-resources/java8
   entrypoint: pwd
-- name: gcr.io/cloud-devrel-kokoro-resources/java8
+- name: gcr.io/cloud-devrel-public-resources/java8
   entrypoint: bash
   args: [
-    './kokoro/build.sh'
+    '.kokoro/build.sh'
   ]
   env:
   - 'JOB_TYPE=samples'
-
-timeout: 300m
+  - 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-sample'
+- name: gcr.io/cloud-devrel-public-resources/java8
+  entrypoint: echo
+  args: [
+    'Sample job succeeded',
+  ]
+timeout: 3600s
+options:
+  defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET