diff --git a/appveyor.yml b/appveyor.yml
index 1d73aefae..a1bde6ca0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,67 +1,49 @@
-version: 4.0.{build}
+--- 
+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"
+        
+        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))
+build_script: 
+  - 
+    ps: "./build.ps1 --settings_skipverification=true"
 configuration: Release
-os: Visual Studio 2017
-environment:
-  nodejs_version: "9.8.0"
-  typescript_version: "3.0.1"  
-  github_auth_token:
+deploy: 
+  - 
+    auth_token: 
+      secure: jDpp1/WUQl3uN41fNI3VeZoRZbDiDfs3GPQ1v+C5ZNE3cWdnUvuJfCCfUbYUV1Rp
+    draft: true
+    provider: GitHub
+    release: "Ombi v$(appveyor_build_version)"
+    true: 
+      branch: master
+environment: 
+  github_auth_token: 
     secure: H/7uCrjmWHGJxgN3l9fbhhdVjvvWI8VVF4ZzQqeXuJwAf+PgSNBdxv4SS+rMQ+RH
-  sonarrcloudtoken:
+  nodejs_version: "9.8.0"
+  sonarrcloudtoken: 
     secure: WGkIog4wuMSx1q5vmSOgIBXMtI/leMpLbZhi9MJnJdBBuDfcv12zwXg3LQwY0WbE
-
-install:
-  # Get the latest stable version of Node.js or io.js
-  - ps: Install-Product node $env:nodejs_version
-
-  - cmd: set path=%programfiles(x86)%\\Microsoft SDKs\TypeScript\3.0;%path%
-  - cmd: tsc -v
-build_script:
- # - dotnet tool install --global dotnet-sonarscanner
- #- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER) { dotnet sonarscanner begin /k:"tidusjar_Ombi"  /d:sonar.organization="tidusjar-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$env.sonarrcloud_token" /d:sonar.analysis.mode="preview" /d:sonar.github.pullRequest="$env:APPVEYOR_PULL_REQUEST_NUMBER" /d:sonar.github.repository="https://github.com/tidusjar/ombi" /d:sonar.github.oauth="$env.github_auth_token" }
- # - ps: if (-Not $env:APPVEYOR_PULL_REQUEST_NUMBER) { dotnet sonarscanner begin /k:"tidusjar_Ombi"  /d:sonar.organization="tidusjar-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$env.SONARRCLOUDTOKEN" }
-  - ps: ./build.ps1 --settings_skipverification=true
- # - dotnet sonarscanner end /d:sonar.login="%sonarrcloudtoken%"
-
-#test:
-  # only assemblies to test
-  #assemblies:
-    #only:
-     # - '**\*.Tests.dll'
-
-
-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"
-
-
-    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))
-    
-
-#cache:
-#- '%USERPROFILE%\.nuget\packages'
-deploy:
-- provider: GitHub
-  release: Ombi v$(appveyor_build_version)
-  auth_token:
-    secure: jDpp1/WUQl3uN41fNI3VeZoRZbDiDfs3GPQ1v+C5ZNE3cWdnUvuJfCCfUbYUV1Rp
-  draft: true
-  on:
-    branch: master
+  typescript_version: "3.0.1"
+install: 
+  - 
+    ps: "Install-Product node $env:nodejs_version"
+  - 
+    cmd: "set path=%programfiles(x86)%\\\\Microsoft SDKs\\TypeScript\\3.0;%path%"
+  - 
+    cmd: "tsc -v"
+os: "Visual Studio 2017"
+version: "4.0.{build}"