diff --git a/.travis.yml b/.travis.yml
index b6c6b04..5962a1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,12 +11,17 @@ matrix:
     node_js: '10'
     script:
     - |
-      docker run --env-file <(env | grep -iE '^(DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|_TOKEN|_KEY|AWS_|STRIP|BUILD_)([A-Z]|_)*=' | sed -n '/^[^\t]/s/=.*//p' | sed '/^$/d' | sed 's/^/-e /g' | tr '\n' ' ') \
-        -v ${PWD}:/project \
-        -v ~/.cache/electron:/root/.cache/electron \
-        -v ~/.cache/electron-builder:/root/.cache/electron-builder \
+      docker run --rm -ti \
+       --env-file <(env | grep -vE '\r|\n' | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS_TAG|TRAVIS|TRAVIS_REPO_|TRAVIS_BUILD_|TRAVIS_BRANCH|TRAVIS_PULL_REQUEST_|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \
+       --env ELECTRON_CACHE="/root/.cache/electron" \
+       --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
+       -v ${PWD}:/project \
+       -v ${PWD##*/}-node-modules:/project/node_modules \
+       -v ~/.cache/electron:/root/.cache/electron \
+       -v ~/.cache/electron-builder:/root/.cache/electron-builder \
         electronuserland/builder:wine \
         /bin/bash -c "make .publish-admin-win"
+
 cache:
   directories:
   - node_modules