diff --git a/.travis.yml b/.travis.yml
index cb9fc23..d1959fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: node_js
-cache: npm
+cache: yarn
 
 node_js:
-  - node
-  
+  - "8"
+
 script:
   - yarn test --coverage --coverageReporters=text-lcov | coveralls
diff --git a/netlify.toml b/netlify.toml
index 835b998..f59a9b4 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -4,7 +4,7 @@
 # “command” is your build command,
 [build]
   publish = "docs/.vuepress/dist"
-  command = "yarn build:docs"
+  command = "rm -rf node_modules && rm -rf package-lock.json && yarn && yarn build:docs"
 
 # Deploy Preview context
 #
@@ -12,8 +12,13 @@
 # inherit these settings.
 [context.deploy-preview]
   publish = "docs/.vuepress/dist"
-  command = "yarn && yarn build:preview"
+  command = "rm -rf node_modules && rm -rf package-lock.json && yarn && yarn build:preview"
 
+# Branch Deploy context: all deploys that are not from a pull/merge request or
+# from the Production branch will inherit these settings.
+[context.branch-deploy]
+  base = "/"
+  command = "rm -rf node_modules && rm -rf package-lock.json && yarn && yarn build:preview"
 
 # Redirects
 # @see https://www.netlify.com/docs/netlify-toml-reference/