diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 33b780ff0..45ee5930a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,7 +8,7 @@ trigger:
     exclude: ['nightly*']
 
 schedules:
-  - cron: '10 0 * * *'
+  - cron: '*/10 * * * *'
     displayName: "scheduled build"
     branches:
       include: ['master']
@@ -171,13 +171,13 @@ jobs:
           gitHubConnection: wez
           repositoryName: wez/wezterm
           action: edit
-          target: $(build.sourceVersion)
+          target: c53ca64c33d1658602b9a3aaa412eca9c6544294
           tagSource: manual
-          tag: nightly-$(wezterm.tagname)
+          tag: nightly
           assets: |
             $(Build.SourcesDirectory)/*.zip
             $(Build.SourcesDirectory)/*.deb
-          title: "Nightly Pre-Release: $(wezterm.tagname)"
+          title: "Nightly Builds"
           assetUploadMode: replace
           addChangeLog: false
           isPreRelease: true
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 7b5b5b434..aa25638bd 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -28,18 +28,28 @@ HERE=$(pwd)
 case $OSTYPE in
   darwin*)
     zipdir=WezTerm-macos-$DEPLOY_ENV_TYPE-$TAG_NAME
-    rm -rf $zipdir $zipdir.zip
+    if [[ "$BUILD_REASON" == "Schedule" ]] ; then
+      zipname=WezTerm-macos-nightly.zip
+    else
+      zipname=$zipdir.zip
+    fi
+    rm -rf $zipdir $zipname
     mkdir $zipdir
     cp -r assets/macos/WezTerm.app $zipdir/
     cp target/release/wezterm $zipdir/WezTerm.app
-    zip -r $zipdir.zip $zipdir
+    zip -r $zipname $zipdir
     ;;
   msys)
     zipdir=WezTerm-windows-$DEPLOY_ENV_TYPE-$TAG_NAME
-    rm -rf $zipdir $zipdir.zip
+    if [[ "$BUILD_REASON" == "Schedule" ]] ; then
+      zipname=WezTerm-windows-nightly.zip
+    else
+      zipname=$zipdir.zip
+    fi
+    rm -rf $zipdir $zipname
     mkdir $zipdir
     cp target/release/wezterm.exe target/release/wezterm.pdb $zipdir
-    7z a -tzip $zipdir.zip $zipdir
+    7z a -tzip $zipname $zipdir
     ;;
   linux-gnu)
     case `lsb_release -ds` in
@@ -61,7 +71,12 @@ Description: Wez's Terminal Emulator.
 Depends: libc6, libegl-mesa0, libxcb-icccm4, libxcb-ewmh2, libxcb-keysyms1, libxcb-xkb1, libxkbcommon0, libxkbcommon-x11-0, libfontconfig1, xdg-utils, libxcb-render0, libxcb-shape0, libx11-6, libegl1
 EOF
         cp target/release/wezterm pkg/debian/usr/bin
-        fakeroot dpkg-deb --build pkg/debian wezterm-$TAG_NAME.deb
+        if [[ "$BUILD_REASON" == "Schedule" ]] ; then
+          debname=wezterm-nightly
+        else
+          debname=wezterm-$TAG_NAME
+        fi
+        fakeroot dpkg-deb --build pkg/debian $debname.deb
         rm -rf pkg
       ;;
     esac