diff --git a/.travis.yml b/.travis.yml
index 180fd865..65d3b2ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,10 @@ addons:
       # Scripting dependencies
       - inkscape
       - imagemagick
-  sauce_connect: true
+  sauce_connect:
+    username: oliverhamlet
+  jwt:
+    secure: "YbmqKNfotisPlMiw1Vk8Ts9xYAegLf+fNb9FfAvNVyHIR7mJw7LivFPdjW5x3P7ktfwPqGxjGjNn0hOCKbLoqueKcq4LHuvdWgOaeqXc2BmVQx+HLzECj0G3uMshiyGZRCf6noJBXPe96YJb/nGj4bhZn/AMiGH+vNkOrPtoJNk="
 
 cache:
   directories:
@@ -99,7 +102,7 @@ deploy:
     file: scripts/travis/loot.bintray.json
     user: wrinklyninja
     key:
-      secure: "YjcfW+VRF3NC3pDxhpn7mAZ/Qs26KPLOwQS3VaC/0F8/tdPqznqEFGiuWGvC7i7NjUyJXDBHEso5GsRG3jxhGt1KOkCptiIsMiubUeUE3xY83oVvzJ/MbK7AXGM5heR3nUYLijzqxSSCbFdVewTdymfpGSWUbf1K+EV0qXUdinA="
+      secure: "CyJpCbkO4pK+h4ZFDqwS3FZNwTaY7638IT7uzVKhGQV2CD9nMR7mb9bL6DG/Uxs91MuBeCu8RwzXtK5IVmPkH5AbMO95JMsjor+t8lT6AHhjvgmAhOBXJa5qMbFBFbLQErTdudHIcOxgjyjA5vqt5Zf0DlWty7WnE10WoU/O7qg="
     skip_cleanup: true
     on:
       all_branches: true
@@ -107,7 +110,7 @@ deploy:
     file: scripts/travis/loot-api.bintray.json
     user: wrinklyninja
     key:
-      secure: "YjcfW+VRF3NC3pDxhpn7mAZ/Qs26KPLOwQS3VaC/0F8/tdPqznqEFGiuWGvC7i7NjUyJXDBHEso5GsRG3jxhGt1KOkCptiIsMiubUeUE3xY83oVvzJ/MbK7AXGM5heR3nUYLijzqxSSCbFdVewTdymfpGSWUbf1K+EV0qXUdinA="
+      secure: "CyJpCbkO4pK+h4ZFDqwS3FZNwTaY7638IT7uzVKhGQV2CD9nMR7mb9bL6DG/Uxs91MuBeCu8RwzXtK5IVmPkH5AbMO95JMsjor+t8lT6AHhjvgmAhOBXJa5qMbFBFbLQErTdudHIcOxgjyjA5vqt5Zf0DlWty7WnE10WoU/O7qg="
     skip_cleanup: true
     on:
       all_branches: true
@@ -115,13 +118,13 @@ deploy:
     file: scripts/travis/metadata-validator.bintray.json
     user: wrinklyninja
     key:
-      secure: "YjcfW+VRF3NC3pDxhpn7mAZ/Qs26KPLOwQS3VaC/0F8/tdPqznqEFGiuWGvC7i7NjUyJXDBHEso5GsRG3jxhGt1KOkCptiIsMiubUeUE3xY83oVvzJ/MbK7AXGM5heR3nUYLijzqxSSCbFdVewTdymfpGSWUbf1K+EV0qXUdinA="
+      secure: "CyJpCbkO4pK+h4ZFDqwS3FZNwTaY7638IT7uzVKhGQV2CD9nMR7mb9bL6DG/Uxs91MuBeCu8RwzXtK5IVmPkH5AbMO95JMsjor+t8lT6AHhjvgmAhOBXJa5qMbFBFbLQErTdudHIcOxgjyjA5vqt5Zf0DlWty7WnE10WoU/O7qg="
     skip_cleanup: true
     on:
       all_branches: true
   - provider: releases
     api_key:
-      secure: YOgb6thQKlp9aG19Vo8mFSzDRKntCcmMD+A4SAxmg919j6ONoSkaeuVxnUz5V2UKWbCaGzUN/fSnYbp51yDxWTFXalvRMckl0GaP5U0543ilpZPs3QdmDYQD7xlDevWBnYlZyU0jbFwX1U+yfW9k3lxea/JSFDwIkFZXY2Dxqmw=
+      secure: "TuiXR/J5cdvgAXqU5x79E7thXwzN4Jqo1vKolPPb5ahrBllBHFh23awyOIdlTnXY1aS6NjS85uIiD3TNZ/hwrtDsjMgNs1ofL6A9B+7uQJjpK8JqFUECrJCMsEhnwRSzIUeqDeZp440x3c0bTFqfSMErrG/ga5S+VyNYHYREqo4="
     file: build/metadata-validator.tar.xz
     skip_cleanup: true
     on:
@@ -134,8 +137,3 @@ notifications:
       - "chat.freenode.net#loot"
     use_notice: true
     skip_join: true
-
-env:
-  global:
-  - secure: OWgDkff/b+0eKk/P75rBnecaPDv1E/gMkCzsTUUtofmzj+sttpMUsh8VOVUvckGs5m3fRwRhc/t99gR4FuDtMOVE5JZ8CqZn7tcv2wNAspQ613pS0nWyIX/IUbyF+gjtPW2dWy81hKVtTP4yFvUn1Gk+JRjJLSyxM53Xt6oTOlY=
-  - secure: XpGbqizjWfaGiWDkrcW4UhSW8ijm00jgSo2qkthza3QmHQ3C0Vye3gQjjITCq+y6izQTPa46fxaI+Ozligyh4aQ1G8SpCa77tXMBfvo31led+s81FlAOSVGDJ/2eDOoawFuj5dTKTPR1zLniDYH8AqG8EDZuLoK6fhx7CchU2Yw=
diff --git a/appveyor.yml b/appveyor.yml
index 3e0779c6..dcc8fa53 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,10 +11,10 @@ cache:
   - C:\projects\boost_1_61_0\stage\lib
 
 environment:
-  access_token:
-    secure: yoODjVeYw01Vg2idJgxMBOkyII/TO3yb6OZfxtzBh/F5z3ZTDW6CHBOiH4AyiX7Y
-  bintray_token:
-    secure: u234T2688DZmz4JH5+0iAHcUcL2fEIGculb8655bn4B1q7GckhplsitzgEbv3NFc
+  github_auth_token:
+    secure: V1GojGQfrAiQtUWtNNXfm3samiH+1yNF5UYhkn8B8mbif20IGTGWNlBS9E4S0SUC
+  bintray_auth_token:
+    secure: fBQJmUDK/EgEUWjjbo6bWcitczeFTJZT4OZ3ZZ4FoUT6soBsTWPQJnr8YEVMFhGP
 
 install:
   - choco install -y doxygen.portable InnoSetup inkscape imagemagick.tool
@@ -63,7 +63,7 @@ deploy:
   - provider: BinTray
     username: wrinklyninja
     api_key:
-      secure: u234T2688DZmz4JH5+0iAHcUcL2fEIGculb8655bn4B1q7GckhplsitzgEbv3NFc
+      secure: fBQJmUDK/EgEUWjjbo6bWcitczeFTJZT4OZ3ZZ4FoUT6soBsTWPQJnr8YEVMFhGP
     subject: wrinklyninja
     repo: loot
     package: LOOT
@@ -74,7 +74,7 @@ deploy:
   - provider: BinTray
     username: wrinklyninja
     api_key:
-      secure: u234T2688DZmz4JH5+0iAHcUcL2fEIGculb8655bn4B1q7GckhplsitzgEbv3NFc
+      secure: fBQJmUDK/EgEUWjjbo6bWcitczeFTJZT4OZ3ZZ4FoUT6soBsTWPQJnr8YEVMFhGP
     subject: wrinklyninja
     repo: loot
     package: LOOT_API
@@ -85,7 +85,7 @@ deploy:
   - provider: BinTray
     username: wrinklyninja
     api_key:
-      secure: u234T2688DZmz4JH5+0iAHcUcL2fEIGculb8655bn4B1q7GckhplsitzgEbv3NFc
+      secure: fBQJmUDK/EgEUWjjbo6bWcitczeFTJZT4OZ3ZZ4FoUT6soBsTWPQJnr8YEVMFhGP
     subject: wrinklyninja
     repo: loot
     package: metadata-validator
@@ -106,7 +106,7 @@ deploy:
 
       *Note: The `metadata-validator.tar.xz` file below contains a Linux binary. It won't work on Windows computers.*
     auth_token:
-      secure: SecSfg5+S0OUzmC+kKixshqNDrRDj2uRYx58AAiZ1IDYTvQbPGRqEYCWZ9jbPd3h
+      secure: V1GojGQfrAiQtUWtNNXfm3samiH+1yNF5UYhkn8B8mbif20IGTGWNlBS9E4S0SUC
     artifact: LOOT,API,metadata-validator,installer
     draft: false
     on:
diff --git a/scripts/appveyor/delete_old_artifacts.ps1 b/scripts/appveyor/delete_old_artifacts.ps1
index 1c16eab0..9106d216 100644
--- a/scripts/appveyor/delete_old_artifacts.ps1
+++ b/scripts/appveyor/delete_old_artifacts.ps1
@@ -38,7 +38,7 @@ function Get-AuthorizationHeaderValue($username, $password) {
 }
 
 $currentBranch = $env:APPVEYOR_REPO_BRANCH
-$bintrayToken = $env:bintray_token
+$bintrayToken = $env:bintray_auth_token
 $bintrayRepoUrl = 'https://api.bintray.com/packages/wrinklyninja/loot'
 $bintrayHeaders = @{ Authorization = (Get-AuthorizationHeaderValue 'wrinklyninja' $bintrayToken) }
 $packages = @(
diff --git a/scripts/appveyor/update_masterlist_branches.ps1 b/scripts/appveyor/update_masterlist_branches.ps1
index 66820ea2..dd9c980d 100644
--- a/scripts/appveyor/update_masterlist_branches.ps1
+++ b/scripts/appveyor/update_masterlist_branches.ps1
@@ -15,7 +15,7 @@ if ($env:APPVEYOR_REPO_TAG -eq 'true') {
   $branchName = Get-BranchName
 
   Write-Output "`nUpdating masterlists' default branch to $branchName..."
-  lomad -t $env:access_token -a -d $branchName
+  lomad -t $env:github_auth_token -a -d $branchName
 
   if ($lastexitcode -eq 0) {
     Write-Output "Masterlists' default branches have been updated."