diff --git a/build/config/env.pyd b/build/config/env.pyd
index bbd66e0..328d805 100644
--- a/build/config/env.pyd
+++ b/build/config/env.pyd
@@ -100,7 +100,7 @@ PROJECT_SITE = "http://www.freenas.org"
 SUPPORT_SITE = "http://bugs.freenas.org"
 
 # Release bits
-TRAIN = TRAIN or "${PRODUCT}-${VERSION_NUMBER}-Nightlies"
+TRAIN = TRAIN or "${PRODUCT}-${VERSION_NUMBER}-STABLE"
 RELEASE_STAGEDIR = "${BE_ROOT}/release/${PRODUCT}-${VERSION}"
 UPGRADE_STAGEDIR = "${BE_ROOT}/release/${TRAIN}-${BUILD_TIMESTAMP}-Update"
 LATEST = "${OBJDIR}/LATEST"
diff --git a/build/tools/post-to-upgrade.py b/build/tools/post-to-upgrade.py
index 9614d3f..149e6a7 100755
--- a/build/tools/post-to-upgrade.py
+++ b/build/tools/post-to-upgrade.py
@@ -40,17 +40,17 @@ create_aux_files = import_function('create-release-distribution', 'create_aux_fi
 def main():
     prod = e("${PRODUCTION}")
     if prod and prod.lower() == "yes":
-        KEY_PASSWORD = getpass.getpass("Enter Password: ")
+        KEY_PASSWORD = e("${IX_KEY_PASSWORD}") or getpass.getpass("Enter Password: ")
     else:
         KEY_PASSWORD = ""
     changelog = e('${CHANGELOG}')
     info('Using ChangeLog: {0}', changelog)
     ssh = e('${UPDATE_USER}@${UPDATE_HOST}')
-    sshopts = '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
+    sshopts = f'-o SendEnv={KEY_PASSWORD} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
     temp_dest = sh_str("ssh ${ssh} ${sshopts} mktemp -d /tmp/update-${PRODUCT}-XXXXXXXXX")
     temp_changelog = sh_str("ssh ${ssh} ${sshopts} mktemp /tmp/changelog-XXXXXXXXX")
     delta_count = e('${DELTAS}')
-    
+
     if not temp_dest or not temp_changelog:
         error('Failed to create temporary directories on {0}', ssh)