diff --git a/appveyor.yml b/appveyor.yml
index 6d306adf4..448d5dd64 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,10 +28,12 @@ build_script:
 
       If(($env:APPVEYOR_REPO_BRANCH -in $deployBranches -Or $env:APPVEYOR_REPO_COMMIT_MESSAGE -Match '!deploy') -And $env:APPVEYOR_REPO_COMMIT_MESSAGE -NotMatch '!build') {
         Write-Output "This is a deployment build"
-        ./build.ps1 --settings_skipverification=true --target=build
+        $env:Deploy = true
+        ./build.ps1 --settings_skipverification=true
       }
       Else 
       {
+        $emv:Deploy = false
         Write-Output "This is a not a deployment build"
         ./build.ps1 --settings_skipverification=true --target=build
       }   
@@ -41,29 +43,15 @@ skip_commits:
     - '**/*.md'
 
 after_build:
-- cmd: >-
-    
-    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.2\windows.zip"
-    
-    
-    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.2\osx.tar.gz"  
-    
-    
-    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.2\linux.tar.gz"
-
+- ps: |
+    If($env:Deploy -eq true) 
+    {
+      Get-ChildItem .\*.zip | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+      Get-ChildItem .\*.gz | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+    }
 
-    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.2\linux-arm.tar.gz"
-
-
-    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.2\windows-32bit.zip"
-
-    
-    appveyor PushArtifact "%APPVEYOR_BUILD_FOLDER%\src\Ombi\bin\Release\netcoreapp2.2\linux-arm64.tar.gz"
-- ps: >-
     $wc = New-Object 'System.Net.WebClient'
-
-    $wc.UploadFile("https://ci.appveyor.com/api/testresults/xunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\src\**\TestResults\Test*.trx))
-    
+    $wc.UploadFile("https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\src\**\TestResults\Test*.trx))
 
 #cache:
 #- '%USERPROFILE%\.nuget\packages'
diff --git a/build.cake b/build.cake
index fdfe6c8a8..d08afe622 100644
--- a/build.cake
+++ b/build.cake
@@ -135,7 +135,7 @@ Task("Gulp Publish")
 Task("TSLint")
     .Does(() =>
 {
-	Yarn.FromPath(uiProjectDir).RunScript("lint");
+	//Yarn.FromPath(uiProjectDir).RunScript("lint");
 });
 
 Task("PrePublish")