diff --git a/gapic/lang/common.yaml b/gapic/lang/common.yaml
index cdefbc3d..7af3bb65 100644
--- a/gapic/lang/common.yaml
+++ b/gapic/lang/common.yaml
@@ -1,5 +1,5 @@
 common:
-  toolkit_path: ${REPOROOT}/toolkit
+  toolkit_path: ${TOOLKIT}
   staging_repo_dir: ${REPOROOT}/api-client-staging/generated
   # common gRPC package generation parameters
   package_dependencies_yaml: ${GOOGLEAPIS}/gapic/packaging/dependencies.yaml
diff --git a/gapic/lang/doc.yaml b/gapic/lang/doc.yaml
index 3d463bbf..7c041e7e 100644
--- a/gapic/lang/doc.yaml
+++ b/gapic/lang/doc.yaml
@@ -1,5 +1,5 @@
 common:
-  toolkit_path: ${REPOROOT}/toolkit
+  toolkit_path: ${TOOLKIT}
   # common gRPC package generation parameters
   package_dependencies_yaml: ${GOOGLEAPIS}/gapic/packaging/dependencies.yaml
   package_defaults_yaml: ${GOOGLEAPIS}/gapic/packaging/api_defaults.yaml