diff --git a/.travis.yml b/.travis.yml
index eccdade4ba..fbc468ff0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,9 @@
 matrix:
   include:
-    - os: linux
-      dist: trusty
-      sudo: true
-      language: node_js
-      node_js: 9
-      install:
-        - sudo apt-get install pkg-config libxss-dev libsecret-1-dev rpm
-        - npm install
-      script:
-        - npm run build
-
     - os: osx
       osx_image: xcode9.2
       language: node_js
-      node_js: 9
+      node_js: 10
       install:
         - npm install
       script:
diff --git a/appveyor.yml b/appveyor.yml
index 930211b538..351abd4110 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,15 +8,7 @@ branches:
 
 stack: node 10
 
-init:
-- ps: |
-    if($isWindows) {
-      Install-Product node 10
-    }
-
 install:
-- sh: sudo apt-get update
-- sh: sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev rpm
 - ps: $env:package_version = (Get-Content -Raw -Path .\src\package.json | ConvertFrom-Json).version
 - ps: |
     if($isWindows) {
@@ -34,7 +26,7 @@ build_script:
     if($isLinux) {
       npm run dist:lin
       Push-AppveyorArtifact ./dist/Bitwarden-$env:package_version-x86_64.AppImage
-      Push-AppveyorArtifact ./dist/bitwarden_$env:package_version_amd64.snap
+      Push-AppveyorArtifact ./dist/bitwarden_${env:package_version}_amd64.snap
       Push-AppveyorArtifact ./dist/Bitwarden-$env:package_version-amd64.deb
       Push-AppveyorArtifact ./dist/Bitwarden-$env:package_version-x64.freebsd
       Push-AppveyorArtifact ./dist/Bitwarden-$env:package_version-x86_64.rpm
@@ -47,7 +39,25 @@ build_script:
       Push-AppveyorArtifact .\dist\Bitwarden-$env:package_version-ia32.appx
     }
 
-cache:
-- '~/.cache/electron -> appveyor.yml'
-- '~/.cache/electron-builder -> appveyor.yml'
-- '%USERPROFILE%\.electron -> appveyor.yml'
+for:
+- matrix:
+    only:
+      - image: Visual Studio 2017
+  
+  init:
+  - ps: Install-Product node 10
+
+  cache:
+  - '%USERPROFILE%\.electron -> appveyor.yml'
+
+- matrix:
+    only:
+      - image: Ubuntu1804
+
+  init:
+  - sh: sudo apt-get update
+  - sh: sudo apt-get -y install pkg-config libxss-dev libsecret-1-dev rpm
+
+  cache:
+  - '/home/appveyor/.cache/electron -> appveyor.yml'
+  - '/home/appveyor/.cache/electron-builder -> appveyor.yml'