diff --git a/packages/google-cloud-apigee-connect/.github/.OwlBot.lock.yaml b/packages/google-cloud-apigee-connect/.github/.OwlBot.lock.yaml
index 2567653c000d..ee94722ab57b 100644
--- a/packages/google-cloud-apigee-connect/.github/.OwlBot.lock.yaml
+++ b/packages/google-cloud-apigee-connect/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:87eee22d276554e4e52863ec9b1cb6a7245815dfae20439712bf644348215a5a
+  digest: sha256:6e7328583be8edd3ba8f35311c76a1ecbc823010279ccb6ab46b7a76e25eafcc
diff --git a/packages/google-cloud-apigee-connect/.kokoro/samples/lint/common.cfg b/packages/google-cloud-apigee-connect/.kokoro/samples/lint/common.cfg
index 19fdb35984d8..56490fd146c3 100644
--- a/packages/google-cloud-apigee-connect/.kokoro/samples/lint/common.cfg
+++ b/packages/google-cloud-apigee-connect/.kokoro/samples/lint/common.cfg
@@ -31,4 +31,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-apigee-connect/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-apigee-connect/.kokoro/trampoline_v2.sh"
\ No newline at end of file
diff --git a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.6/common.cfg b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.6/common.cfg
index 2cbab5eca805..685da0004b0b 100644
--- a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.6/common.cfg
+++ b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.6/common.cfg
@@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-apigee-connect/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-apigee-connect/.kokoro/trampoline_v2.sh"
\ No newline at end of file
diff --git a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.6/periodic.cfg b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.6/periodic.cfg
index 50fec9649732..71cd1e597e38 100644
--- a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.6/periodic.cfg
+++ b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.6/periodic.cfg
@@ -3,4 +3,4 @@
 env_vars: {
     key: "INSTALL_LIBRARY_FROM_SOURCE"
     value: "False"
-}
\ No newline at end of file
+}
diff --git a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.7/common.cfg b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.7/common.cfg
index 582f124fe042..47781e18d982 100644
--- a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.7/common.cfg
+++ b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.7/common.cfg
@@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-apigee-connect/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-apigee-connect/.kokoro/trampoline_v2.sh"
\ No newline at end of file
diff --git a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.7/periodic.cfg b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.7/periodic.cfg
index 50fec9649732..71cd1e597e38 100644
--- a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.7/periodic.cfg
+++ b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.7/periodic.cfg
@@ -3,4 +3,4 @@
 env_vars: {
     key: "INSTALL_LIBRARY_FROM_SOURCE"
     value: "False"
-}
\ No newline at end of file
+}
diff --git a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.8/common.cfg b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.8/common.cfg
index 39a9deccb001..313b315ce767 100644
--- a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.8/common.cfg
+++ b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.8/common.cfg
@@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-apigee-connect/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-apigee-connect/.kokoro/trampoline_v2.sh"
\ No newline at end of file
diff --git a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.8/periodic.cfg b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.8/periodic.cfg
index 50fec9649732..71cd1e597e38 100644
--- a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.8/periodic.cfg
+++ b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.8/periodic.cfg
@@ -3,4 +3,4 @@
 env_vars: {
     key: "INSTALL_LIBRARY_FROM_SOURCE"
     value: "False"
-}
\ No newline at end of file
+}
diff --git a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.9/common.cfg b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.9/common.cfg
index 1c2a95f80f07..d6fa41fb6832 100644
--- a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.9/common.cfg
+++ b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.9/common.cfg
@@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-apigee-connect/.kokoro/trampoline.sh"
\ No newline at end of file
+build_file: "python-apigee-connect/.kokoro/trampoline_v2.sh"
\ No newline at end of file
diff --git a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.9/periodic.cfg b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.9/periodic.cfg
index 50fec9649732..71cd1e597e38 100644
--- a/packages/google-cloud-apigee-connect/.kokoro/samples/python3.9/periodic.cfg
+++ b/packages/google-cloud-apigee-connect/.kokoro/samples/python3.9/periodic.cfg
@@ -3,4 +3,4 @@
 env_vars: {
     key: "INSTALL_LIBRARY_FROM_SOURCE"
     value: "False"
-}
\ No newline at end of file
+}
diff --git a/packages/google-cloud-apigee-connect/.kokoro/test-samples-against-head.sh b/packages/google-cloud-apigee-connect/.kokoro/test-samples-against-head.sh
index b8ff1f2d386a..ba3a707b040c 100755
--- a/packages/google-cloud-apigee-connect/.kokoro/test-samples-against-head.sh
+++ b/packages/google-cloud-apigee-connect/.kokoro/test-samples-against-head.sh
@@ -23,6 +23,4 @@ set -eo pipefail
 # Enables `**` to include files nested inside sub-folders
 shopt -s globstar
 
-cd github/python-apigee-connect
-
 exec .kokoro/test-samples-impl.sh
diff --git a/packages/google-cloud-apigee-connect/.kokoro/test-samples.sh b/packages/google-cloud-apigee-connect/.kokoro/test-samples.sh
index eea532778995..11c042d342d7 100755
--- a/packages/google-cloud-apigee-connect/.kokoro/test-samples.sh
+++ b/packages/google-cloud-apigee-connect/.kokoro/test-samples.sh
@@ -24,8 +24,6 @@ set -eo pipefail
 # Enables `**` to include files nested inside sub-folders
 shopt -s globstar
 
-cd github/python-apigee-connect
-
 # Run periodic samples tests at latest release
 if [[ $KOKORO_BUILD_ARTIFACTS_SUBDIR = *"periodic"* ]]; then
     # preserving the test runner implementation.
diff --git a/packages/google-cloud-apigee-connect/.trampolinerc b/packages/google-cloud-apigee-connect/.trampolinerc
index 383b6ec89fbc..0eee72ab62aa 100644
--- a/packages/google-cloud-apigee-connect/.trampolinerc
+++ b/packages/google-cloud-apigee-connect/.trampolinerc
@@ -16,15 +16,26 @@
 
 # Add required env vars here.
 required_envvars+=(
-    "STAGING_BUCKET"
-    "V2_STAGING_BUCKET"
 )
 
 # Add env vars which are passed down into the container here.
 pass_down_envvars+=(
+    "NOX_SESSION"
+    ###############
+    # Docs builds
+    ###############
     "STAGING_BUCKET"
     "V2_STAGING_BUCKET"
-    "NOX_SESSION"
+    ##################
+    # Samples builds
+    ##################
+    "INSTALL_LIBRARY_FROM_SOURCE"
+    "RUN_TESTS_SESSION"
+    "BUILD_SPECIFIC_GCLOUD_PROJECT"
+    # Target directories.
+    "RUN_TESTS_DIRS"
+    # The nox session to run.
+    "RUN_TESTS_SESSION"
 )
 
 # Prevent unintentional override on the default image.