diff --git a/script/upload.py b/script/upload.py
index b4fc96ec4c9b..707dcb5079ab 100755
--- a/script/upload.py
+++ b/script/upload.py
@@ -163,15 +163,16 @@ def create_or_get_release_draft(github, releases, tag, tag_exists):
       return release['id']
 
   if tag_exists:
-    tag += '-do-not-publish-me'
+    tag = 'do-not-publish-me'
   return create_release_draft(github, tag)
 
 
 def create_release_draft(github, tag):
-  name = '{0} {1}'.format(PROJECT_NAME, tag)
   if os.environ.has_key('CI'):
+    name = '{0} pending draft'.format(PROJECT_NAME)
     body = '(placeholder)'
   else:
+    name = '{0} {1}'.format(PROJECT_NAME, tag)
     body = get_text_with_editor(name)
   if body == '':
     sys.stderr.write('Quit due to empty release note.\n')