diff --git a/.travis.yml b/.travis.yml
index 168d781..dae5471 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,7 +52,7 @@ deploy:
     skip_cleanup: true
     on:
       tags: true
-      condition: $BUILD_DOCKER = true && $TRAVIS_TAG != "latest"
+      condition: $BUILD_DOCKER = true && $TRAVIS_TAG != "latest" && $TRAVIS_TAG != "nightly"
 
   # Push to pypi
   - provider: script
@@ -60,4 +60,4 @@ deploy:
     skip_cleanup: true
     on:
       tags: true
-      condition: $BUILD_PYPI = true && $TRAVIS_TAG != "latest"
+      condition: $BUILD_PYPI = true && $TRAVIS_TAG != "latest" && $TRAVIS_TAG != "nightly"
diff --git a/Makefile b/Makefile
index 226b94d..d7c2475 100644
--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,14 @@ bundle: ## Bundle the tutor package in a single "dist/tutor" executable
 dist/tutor:
 	$(MAKE) bundle
 
-tag: ## Create a release, update the "latest" tag and push them to origin
-	$(MAKE) retag TAG=v$(shell make version)
-	$(MAKE) retag TAG=latest
+nightly: ## Create a "nightly" release
+	$(MAKE) tag TAG=nightly
 
-retag:
+release: ## Create a release, update the "latest" tag and push them to origin
+	$(MAKE) tag TAG=v$(shell make version)
+	$(MAKE) tag TAG=latest
+
+tag:
 	@echo "=== Creating tag $(TAG)"
 	git tag -d $(TAG) || true
 	git tag $(TAG)
diff --git a/docs/tutor.rst b/docs/tutor.rst
index f37a635..1c2e144 100644
--- a/docs/tutor.rst
+++ b/docs/tutor.rst
@@ -42,4 +42,6 @@ Releasing a new version
 - Replace "Latest" by the version name in CHANGELOG.md.
 - Create a commit with the version changelog.
 - ``git push``
-- ``make tag``
+- ``make release``
+
+After a regular push to ``master``, run ``make nightly`` to update the "nightly" tag.