diff --git a/.drone.yml b/.drone.yml
index 32b87324d5a..1c6a48fcdfe 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -81,6 +81,47 @@ trigger:
     # exclude the tags used to build Docker images for drone
     - refs/tags/builder-*
     - refs/tags/drone-*
+    - refs/tags/nightly
 
 depends_on:
-  - test
\ No newline at end of file
+  - test
+
+---
+kind: pipeline
+name: nightly
+
+steps:
+- name: fetch
+  # extra step needed to fetch tags after cloning
+  image: docker:git
+  commands:
+    - git fetch --tags
+
+- name: build
+  image: arduino/arduino-cli:builder-0.1
+  commands:
+    - goreleaser --snapshot
+
+- name: upload
+  image: plugins/s3
+  settings:
+    bucket: arduino-downloads-prod-beagle
+    access_key:
+      from_secret: downloads_drone_io_aws_access_key_id
+    secret_key:
+      from_secret: downloads_drone_io_aws_secret_access_key
+    source: dist/*
+    target: /${DRONE_REPO_NAME}/nightly
+    strip_prefix: dist/
+    exclude:
+      - dist/config.yaml
+
+trigger:
+  status:
+    # skip the release if the previous build failed
+    - success
+  ref:
+    - refs/tags/nightly
+
+depends_on:
+  - test
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 5abd4f57c8c..170856c08a1 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,9 +1,9 @@
 # Global section
 checksum:
-  name_template: 'checksums.txt'
+  name_template: '{{ .Tag }}-{{ time "20060102" }}-checksums.txt'
 
 snapshot:
-  name_template: "{{ .Tag }}-next"
+  name_template: '{{ .Tag }}-{{ time "20060102" }}'
 
 changelog:
   sort: asc
@@ -99,4 +99,4 @@ blob:
     bucket: arduino-downloads-prod-beagle
     ids:
       - arduino_cli
-    folder: "{{ .ProjectName }}"
\ No newline at end of file
+    folder: "{{ .ProjectName }}"