diff --git a/.snapcraft/travis_snapcraft.cfg b/.snapcraft/travis_snapcraft.cfg
deleted file mode 100644
index 5ae2683830..0000000000
--- a/.snapcraft/travis_snapcraft.cfg
+++ /dev/null
@@ -1,50 +0,0 @@
-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
-0kLKLD3Ot1kuSZ1UTTH8hQ==
diff --git a/.travis.yml b/.travis.yml
index 9302fb573d..e4ced8ceb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,19 @@ language: c
 
 env:
   global:
+    # Encrypted environment variables, see
+    # http://docs.travis-ci.com/user/encryption-keys/
+    #
+    # SNAP_SECRET_KEY: generated by:
+    #   travis encrypt SNAP_SECRET_KEY=xx --add
+    # https://github.com/neovim/neovim/pull/11428
+    # snapcraft key expires after 1 year. Steps to refresh it:
+    #   1. snapcraft enable-ci travis --refresh
+    #   2. mv .snapcraft/travis_snapcraft.cfg ci/snap/travis_snapcraft.cfg
+    #   3. Copy after_success command to ci/snap/deploy.sh from .travis.yml
+    #   4. Undo changes to .travis.yml
+    - secure: hd0qn2u8ABbJg5Bx4pBRcUQbKYFmcSHoecyHIPTCnGJT+NI41Bvm/IkN/N5DhBF+LbD3Q2nmR/dzI5H/dqS7RxMFvEx1DuFLendFHHX3MYf0AuKpXYY3gwgMTmqx8p/v6srlU7RBGWNGzHCWqksAem+EIWCe3I7WvfdKo1/DV/Y=
+
     # Set "false" to force rebuild of third-party dependencies.
     - CACHE_ENABLE=true
     # Build directory for Neovim.
@@ -145,7 +158,7 @@ jobs:
       env:
         - CLANG_SANITIZER=TSAN
         - *common-job-env
-    - if: type != pull
+    - if: type != pull_request
       name: snap
       os: linux
       env:
@@ -162,16 +175,19 @@ jobs:
           - name: transfer
           - name: lxd
             channel: stable
+      # Override default before_install, before_cache.
       before_install: /bin/true
+      before_cache: /bin/true
       install: ci/snap/install.sh
       before_script: echo "Building snap..."
       script: ci/snap/script.sh
       after_success: ci/snap/after_success.sh
-      before_cache: /bin/true
       deploy:
         skip_cleanup: true
         provider: script
         script: ci/snap/deploy.sh
+        on:
+          branch: master
   fast_finish: true
 
 before_install: ci/before_install.sh
diff --git a/ci/snap/after_success.sh b/ci/snap/after_success.sh
index 92a3e72036..e66721a5e2 100755
--- a/ci/snap/after_success.sh
+++ b/ci/snap/after_success.sh
@@ -12,8 +12,3 @@ sudo snap install "$RESULT_SNAP" --dangerous --classic
 
 SHA256=$(sha256sum "$RESULT_SNAP")
 echo "SHA256: ${SHA256} ."
-
-timeout 240 /snap/bin/transfer "$RESULT_SNAP"
-
-travis_retry bash "${ROOT_PATH}/scripts/services/0x0.st.sh" "${RESULT_SNAP}"
-
diff --git a/ci/snap/deploy.sh b/ci/snap/deploy.sh
index 2195aed325..3f959c05e5 100755
--- a/ci/snap/deploy.sh
+++ b/ci/snap/deploy.sh
@@ -4,19 +4,15 @@ set -e
 set -o pipefail
 
 # not a tagged release, abort
-[[ "$TRAVIS_TAG" != "$TRAVIS_BRANCH" ]] && exit 0
+# [[ "$TRAVIS_TAG" != "$TRAVIS_BRANCH" ]] && exit 0
 
-openssl enc \
-  -aes-256-cbc \
-  -md sha512 \
-  -pbkdf2 \
-  -iter 1000 \
-  -a -d \
-  -in .snapcraft/travis_snapcraft.cfg \
-  -out .snapcraft/snapcraft.cfg -k $SNAP_SECRECT_KEY
+mkdir -p .snapcraft
+openssl aes-256-cbc -K $encrypted_ece1c4844832_key -iv $encrypted_ece1c4844832_iv
+  -in ci/snap/travis_snapcraft.cfg -out .snapcraft/snapcraft.cfg -d
 
 SNAP=$(find ./ -name "*.snap")
 
+# TODO(justinmk): This always does `edge` until we enable tagged builds.
 if [[ "$SNAP" =~ "dirty" || "$SNAP" =~ "nightly" ]]; then
   snapcraft push "$SNAP" --release edge
 else
diff --git a/ci/snap/travis_snapcraft.cfg b/ci/snap/travis_snapcraft.cfg
new file mode 100644
index 0000000000..3e6a60c30d
Binary files /dev/null and b/ci/snap/travis_snapcraft.cfg differ