diff --git a/.kokoro/appengine-datastore-flex.cfg b/.kokoro/appengine-datastore-flex.cfg
new file mode 100644
index 0000000000..8523310b0d
--- /dev/null
+++ b/.kokoro/appengine-datastore-flex.cfg
@@ -0,0 +1,16 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download secrets from Cloud Storage.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/nodejs-docs-samples"
+
+# Tell the trampoline which build file to use.
+env_vars: {
+    key: "TRAMPOLINE_BUILD_FILE"
+    value: "github/nodejs-docs-samples/.kokoro/appengine.sh"
+}
+
+# Set GAE environment
+env_vars: {
+    key: "APPENGINE_ENVIRONMENT"
+    value: "flexible"
+}
\ No newline at end of file
diff --git a/.kokoro/appengine-datastore.cfg b/.kokoro/appengine-datastore-standard.cfg
similarity index 78%
rename from .kokoro/appengine-datastore.cfg
rename to .kokoro/appengine-datastore-standard.cfg
index 0effa5eb3f..03b5890d66 100644
--- a/.kokoro/appengine-datastore.cfg
+++ b/.kokoro/appengine-datastore-standard.cfg
@@ -8,3 +8,9 @@ env_vars: {
     key: "TRAMPOLINE_BUILD_FILE"
     value: "github/nodejs-docs-samples/.kokoro/appengine-datastore.sh"
 }
+
+# Set GAE environment
+env_vars: {
+    key: "APPENGINE_ENVIRONMENT"
+    value: "standard"
+}
\ No newline at end of file
diff --git a/.kokoro/appengine-datastore.sh b/.kokoro/appengine-datastore.sh
index 1ff527c60c..e0a350570e 100755
--- a/.kokoro/appengine-datastore.sh
+++ b/.kokoro/appengine-datastore.sh
@@ -17,7 +17,7 @@
 export GCLOUD_PROJECT=nodejs-docs-samples-tests
 
 export NODE_ENV=development
-export GAE_VERSION=appengine-datastore-flexible
+export GAE_VERSION=appengine-datastore-${APPENGINE_ENVIRONMENT}
 
 # Register post-test cleanup
 function cleanup {
@@ -41,9 +41,9 @@ gcloud config set project $GCLOUD_PROJECT
 
 
 # Deploy the app
-gcloud app deploy app.flexible.yaml --version $GAE_VERSION --no-promote --quiet
+gcloud app deploy app.${APPENGINE_ENVIRONMENT}.yaml --version $GAE_VERSION --no-promote --quiet
 if [ -e "worker.yaml" ]; then
-  gcloud app deploy worker.yaml --version ${GAE_VERSION}-worker --no-promote --quiet
+  gcloud app deploy worker.yaml --version ${GAE_VERSION} --no-promote --quiet
 fi