diff --git a/.jenkins/infrastructure/docker/build_mystikos_base_docker.Jenkinsfile b/.jenkins/infrastructure/docker/build_mystikos_base_docker.Jenkinsfile
index 40d45e3c8..35e01d12f 100644
--- a/.jenkins/infrastructure/docker/build_mystikos_base_docker.Jenkinsfile
+++ b/.jenkins/infrastructure/docker/build_mystikos_base_docker.Jenkinsfile
@@ -13,8 +13,8 @@ pipeline {
         string(name: "MYST_VERSION", description: "Mystikos release version (Example: 0.5.0). See https://github.com/deislabs/mystikos/releases for release versions. Alternatively can be pulled from a storage blob given a file name")
         string(name: "STORAGE_BLOB", defaultValue: '', description: '[OPTIONAL] Pull Mystikos release from a storage blob')
         string(name: "STORAGE_BLOB_CRED_ID", defaultValue: '', description: '[OPTIONAL] Credential ID to use to access STORAGE_BLOB')
-        string(name: "OE_BASE_CONTAINER_TAG", defaultValue: "latest", description: "The tag for the base OE Docker container. See https://github.com/openenclave/openenclave/blob/master/DOCKER_IMAGES.md for available tags")
-        string(name: "MYST_BASE_CONTAINER_TAG", defaultValue: "latest", description: "The tag for the new Mystikos base Docker container.")
+        string(name: "OE_BASE_CONTAINER_TAG", defaultValue: "CHANGEME", description: 'The tag for the base OE Docker container. Do not use "latest". See https://github.com/openenclave/openenclave/blob/master/DOCKER_IMAGES.md for available tags')
+        string(name: "MYST_BASE_CONTAINER_TAG", defaultValue: "", description: "The tag for the new Mystikos base Docker container. Leave empty for an autogenerated tag.")
         string(name: "CONTAINER_REPO", defaultValue: "https://mystikos.azurecr.io", description: "Url for internal Docker repository")
         string(name: "CONTAINER_REPO_CRED_ID", defaultValue: 'mystikos-public-container-registry', description: "Credential ID for internal Docker repository")
         string(name: "OECI_LIB_VERSION", defaultValue: 'master', description: 'Version of OE Libraries to use')