diff --git a/Makefile b/Makefile
index 3503a91fb..2e5aceba2 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ ifdef BETA_SUBDIR
 endif
 BETA_PATH := $(BRANCH_PATH)$(TAG)$(BETA_SUBDIR)
 BETA_URL := https://beta.rclone.org/$(BETA_PATH)/
-BETA_UPLOAD_ROOT := memstore:beta-rclone-org
+BETA_UPLOAD_ROOT := beta.rclone.org:
 BETA_UPLOAD := $(BETA_UPLOAD_ROOT)/$(BETA_PATH)
 # Pass in GOTAGS=xyz on the make command line to set build tags
 ifdef GOTAGS
@@ -167,7 +167,7 @@ website:
 	@if grep -R "raw HTML omitted" docs/public ; then echo "ERROR: found unescaped HTML - fix the markdown source" ; fi
 
 upload_website:	website
-	rclone -v sync docs/public memstore:www-rclone-org
+	rclone -v sync docs/public www.rclone.org:
 
 upload_test_website:	website
 	rclone -P sync docs/public test-rclone-org:
@@ -194,8 +194,8 @@ check_sign:
 	cd build && gpg --verify SHA256SUMS && gpg --decrypt SHA256SUMS | sha256sum -c
 
 upload:
-	rclone -P copy build/ memstore:downloads-rclone-org/$(TAG)
-	rclone lsf build --files-only --include '*.{zip,deb,rpm}' --include version.txt | xargs -i bash -c 'i={}; j="$$i"; [[ $$i =~ (.*)(-v[0-9\.]+-)(.*) ]] && j=$${BASH_REMATCH[1]}-current-$${BASH_REMATCH[3]}; rclone copyto -v "memstore:downloads-rclone-org/$(TAG)/$$i" "memstore:downloads-rclone-org/$$j"'
+	rclone -P copy build/ downloads.rclone.org:/$(TAG)
+	rclone lsf build --files-only --include '*.{zip,deb,rpm}' --include version.txt | xargs -i bash -c 'i={}; j="$$i"; [[ $$i =~ (.*)(-v[0-9\.]+-)(.*) ]] && j=$${BASH_REMATCH[1]}-current-$${BASH_REMATCH[3]}; rclone copyto -v "downloads.rclone.org:/$(TAG)/$$i" "downloads.rclone.org:/$$j"'
 
 upload_github:
 	./bin/upload-github $(TAG)
@@ -205,7 +205,7 @@ cross:	doc
 
 beta:
 	go run bin/cross-compile.go $(BUILD_FLAGS) $(BUILDTAGS) $(BUILD_ARGS) $(TAG)
-	rclone -v copy build/ memstore:pub-rclone-org/$(TAG)
+	rclone -v copy build/ pub.rclone.org:/$(TAG)
 	@echo Beta release ready at https://pub.rclone.org/$(TAG)/
 
 log_since_last_release:
@@ -218,18 +218,18 @@ ci_upload:
 	sudo chown -R $$USER build
 	find build -type l -delete
 	gzip -r9v build
-	./rclone --config bin/travis.rclone.conf -v copy build/ $(BETA_UPLOAD)/testbuilds
+	./rclone --no-check-dest --config bin/ci.rclone.conf -v copy build/ $(BETA_UPLOAD)/testbuilds
 ifeq ($(or $(BRANCH_PATH),$(RELEASE_TAG)),)
-	./rclone --config bin/travis.rclone.conf -v copy build/ $(BETA_UPLOAD_ROOT)/test/testbuilds-latest
+	./rclone --no-check-dest --config bin/ci.rclone.conf -v copy build/ $(BETA_UPLOAD_ROOT)/test/testbuilds-latest
 endif
 	@echo Beta release ready at $(BETA_URL)/testbuilds
 
 ci_beta:
 	git log $(LAST_TAG).. > /tmp/git-log.txt
 	go run bin/cross-compile.go -release beta-latest -git-log /tmp/git-log.txt $(BUILD_FLAGS) $(BUILDTAGS) $(BUILD_ARGS) $(TAG)
-	rclone --config bin/travis.rclone.conf -v copy --exclude '*beta-latest*' build/ $(BETA_UPLOAD)
+	rclone --no-check-dest --config bin/ci.rclone.conf -v copy --exclude '*beta-latest*' build/ $(BETA_UPLOAD)
 ifeq ($(or $(BRANCH_PATH),$(RELEASE_TAG)),)
-	rclone --config bin/travis.rclone.conf -v copy --include '*beta-latest*' --include version.txt build/ $(BETA_UPLOAD_ROOT)$(BETA_SUBDIR)
+	rclone --no-check-dest --config bin/ci.rclone.conf -v copy --include '*beta-latest*' --include version.txt build/ $(BETA_UPLOAD_ROOT)$(BETA_SUBDIR)
 endif
 	@echo Beta release ready at $(BETA_URL)
 
diff --git a/bin/ci.rclone.conf b/bin/ci.rclone.conf
new file mode 100644
index 000000000..3dca5df18
--- /dev/null
+++ b/bin/ci.rclone.conf
@@ -0,0 +1,4 @@
+# Encrypted rclone configuration File
+
+RCLONE_ENCRYPT_V0:
+H/3G07cjuVyWvg8Ce4dkNzXDRAr37SBHa8cxkPQFtfwKOFDkEmSecuCYun0j/0XtQl9EluGssBMgdztL9sErIsber+QFi27VUWTCXaLnhj940ylSbjI7DnOXtnQGi+WWjdWlW4e8IEbVg44h1Z/iU4D0pyMzMLaEpGHUtnhab+/dBNI5QTtXS+2W1kvDau0C/C3CJULoyMBGC63NMIFl1ks15j67CyiGspCGGbGqo9UlaoMvnK1YlMQX0zIDD4YeNU8M8puxteVHWX6MKGCsd2xY1l7hd47DDIQ1cDIFI5oJWSE2lFGhUs3F5xU4gIV9dOQHrsKom7PCwKaEfLXBJToBMLKphMtElkucEb7DTDdDGNyOyOQ8GSwbkDnsBWydE5S0YQEAt893kZ+QisQsWqfNBcKOLatbuUyq4RBvuNxyyXzC9sVYdA2qgJ+BlZvEihd76i/ZwXnyVpQc+LemgGYFjz0QkVfAd0X63oUkn5GGMpw8eL0w7LcIUan4z//x3jUUwV5muGegC4LUWTBBkgDnkrzuAQ==
\ No newline at end of file
diff --git a/bin/tidy-beta b/bin/tidy-beta
index 9d5d29fad..bbcc7234f 100755
--- a/bin/tidy-beta
+++ b/bin/tidy-beta
@@ -18,4 +18,4 @@ rclone ${dry_run} -vv -P --checkers 16 --transfers 16 delete \
        --fast-list \
        --include "/${version}**" \
        --include "/branch/*/${version}**" \
-       memstore:beta-rclone-org
+       beta.rclone.org:
diff --git a/bin/travis.rclone.conf b/bin/travis.rclone.conf
deleted file mode 100644
index 597253c1a..000000000
--- a/bin/travis.rclone.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Encrypted rclone configuration File
-
-RCLONE_ENCRYPT_V0:
-XIkAr3p+y+zai82cHFH8UoW1y1XTe6dpTzo/g4uSwqI2pfsnSSJ4JbAsRZ9nGVpx3NzROKEewlusVHNokiA4/nD4NbT+2DJrpMLg/OtLREICfuRk3tVWPKLGsmA+TLKU+IfQMO4LfrrCe2DF/lW0qA5Xu16E0Vn++jNhbwW2oB+JTkaGka8Ae3CyisM/3NUGnCOG/yb5wLH7ybUstNYPHsNFCiU1brFXQ4DNIbUFMmca+5S44vrOWvhp9QijQXlG7/JjwrkqbB/LK2gMJPTuhY2OW+4tRw1IoCXbWmwJXv5xmhPqanW92A==
\ No newline at end of file
diff --git a/docs/config.json b/docs/config.json
index 38849ee67..ea1e6888d 100644
--- a/docs/config.json
+++ b/docs/config.json
@@ -6,7 +6,7 @@
   },
   "baseurl": "https://rclone.org",
   "title": "rclone - rsync for cloud storage",
-  "description": "rclone - rsync for cloud storage: google drive, s3, swift, cloudfiles, dropbox, memstore...",
+  "description": "rclone - rsync for cloud storage: google drive, s3, gcs, azure, dropbox, box...",
   "canonifyurls": false,
   "disableKinds": [
     "taxonomy",