diff --git a/scripts/build/update_repo/update-deb.sh b/scripts/build/update_repo/update-deb.sh
index f2eb2f0dfd3..15c555d3426 100755
--- a/scripts/build/update_repo/update-deb.sh
+++ b/scripts/build/update_repo/update-deb.sh
@@ -14,14 +14,15 @@ set -e
 cp scripts/build/update_repo/aptly.conf /etc/aptly.conf
 mkdir -p /deb-repo/db
 mkdir -p /deb-repo/repo
+mkdir -p /deb-repo/tmp
 
 # Download the database
 gsutil -m rsync -r gs://grafana-aptly-db/repo-db /deb-repo/db
 
 # Add the new release to the repo
-set +e
-aptly publish drop squeeze filesystem:repo:grafana
-set -e
+aptly publish drop squeeze filesystem:repo:grafana || true
+cp ./dist/*.deb /deb-repo/tmp
+rm /deb-repo/tmp/grafana_latest*.deb || true
 aptly repo add grafana ./dist
 
 # Setup signing and sign the repo
diff --git a/scripts/build/update_repo/update-rpm.sh b/scripts/build/update_repo/update-rpm.sh
index ca943957fe4..b89468938a6 100755
--- a/scripts/build/update_repo/update-rpm.sh
+++ b/scripts/build/update_repo/update-rpm.sh
@@ -18,6 +18,7 @@ gsutil -m rsync -r "gs://grafana-repo/$RELEASE_TYPE/rpm" /rpm-repo
 
 # Add the new release to the repo
 cp ./dist/*.rpm /rpm-repo
+rm /rpm-repo/grafana-latest-1*.rpm || true
 cd /rpm-repo
 createrepo .