diff --git a/appveyor.yml b/appveyor.yml
index 7ff10f3cdc..c5016221fd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,7 @@
 version: 0.0.5.{build}
-os: Previous Visual Studio 2015
+image:
+  - Visual Studio 2015
+  - Visual Studio 2017 RC
 cache:
 - C:\ProgramData\chocolatey\bin -> scripts\ps\appveyor_install.ps1
 - C:\ProgramData\chocolatey\lib -> scripts\ps\appveyor_install.ps1
diff --git a/scripts/ps/appveyor_deploy.ps1 b/scripts/ps/appveyor_deploy.ps1
index 55a5363f9f..fa4a605483 100644
--- a/scripts/ps/appveyor_deploy.ps1
+++ b/scripts/ps/appveyor_deploy.ps1
@@ -3,7 +3,9 @@
 ###########################################
 
 $testing = (${env:Configuration} -like "*tests")
-if (-not $testing)
+# Only deploy from VS2015 for now.
+$vs2015 = (${env:APPVEYOR_JOB_NAME} -like "*2015*")
+if (-not $testing -and $vs2015)
 {
     # Check if OpenRCT2.org API security token is available
     if (${env:OPENRCT2_ORG_TOKEN})