diff --git a/.kokoro/populate-secrets.sh b/.kokoro/populate-secrets.sh
index 0fa3af706c14..93349df2028d 100755
--- a/.kokoro/populate-secrets.sh
+++ b/.kokoro/populate-secrets.sh
@@ -28,12 +28,27 @@ mkdir -p ${SECRET_LOCATION}
 for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g")
 do
   msg "Retrieving secret ${key}"
-  docker run --entrypoint=gcloud \
-    --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
+  VERSION=$(docker run --rm --entrypoint=gcloud \
+    --volume="${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR}" \
     gcr.io/google.com/cloudsdktool/cloud-sdk \
-    secrets versions access latest \
+    secrets versions list "${key}" \
     --project cloud-devrel-kokoro-resources \
-    --secret ${key} > \
+    --filter="state=enabled" \
+    --sort-by="~createTime" \
+    --limit=1 \
+    --format="value(name.basename())") || VERSION=""
+  
+  if [ -z "${VERSION}" ]; then
+    msg "Error retrieving enabled version for secret ${key}"
+    exit 1
+  fi
+
+  docker run --rm --entrypoint=gcloud \
+    --volume="${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR}" \
+    gcr.io/google.com/cloudsdktool/cloud-sdk \
+    secrets versions access "${VERSION}" \
+    --project cloud-devrel-kokoro-resources \
+    --secret "${key}" > \
     "${SECRET_LOCATION}/${key}"
   if [[ $? == 0 ]]; then
     msg "Secret written to ${SECRET_LOCATION}/${key}"