diff --git a/.travis.yml b/.travis.yml
index cf01284d35..8b83707fc9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -150,6 +150,9 @@ before_deploy:
       if [[ "${BUILD_TARGET}" = "osx_build" ]]; then
           mv build/release/install/bin/mavsdk_server build/release/install/bin/mavsdk_server_macos;
       fi;
+      if [[ "${BUILD_TARGET}" = "windows" ]]; then
+          mv build/release/install/bin/mavsdk_server_bin.exe build/release/install/bin/mavsdk_server_win64.exe;
+      fi;
   fi
 
 deploy:
@@ -200,7 +203,7 @@ deploy:
       secure: hBX3pFWNZiDbz4yKnOjhLg3QS9Ubn1XePxSeIt2Btq5GzbomOPDCgpIFijBppliwj9oKc302EMnZSg2QWeAzFKn9UnmIflJ0E4iymYgwWdTJv+bSnYALJEmO8F6gF9FgRlPk8FCtZiECoTsa75w5TrEZKZpFpmzVYRiDu0eo6sEjW7UJPC0A2KSTXLrBCHSIZy/iasbGmuur4brG7NO0QdMOvDXvhsYfkXDRJFMTtTHvLiKJcqiunPfqARzf1H4x4iczRYscKu5Vn8Kmw3NANGkcIDvEj4ooih831EXxACRZw0VgycgNHOKRXKC9pZ4hLQMon+jxpQX+X8k/K5161oEkF/gCVKyFb31Pk/4Uwe81p1GJY2lAC7MDUxA98RKXhdvVYF2Cp44+IbF0YVoWRUtVAhknXRQ3Weg25kyVSu83q2nN2nZq2qGTnpNIbdN56s/F+uaFtipGEh+vmiv8rNUz+Z5MFrY2FQaSvBTFw9K4tNs9uc+VQd1bE7X5wh0yywEqUEw2nzqTB2xR+OubygUASbk2GLNdc254P0lrzCHbNM62Y7sRX06CM7hPlwhELEkVtUXZWJ0KuhQyLvRh3aPJ3Jj30EswTt/FGT1gzSP1FjjHBRZCK4P2D2rwJ5TMn2JrZKfPxmEd3kVmn6h80+gBbKgonGmZspd2SvPEI5g=
   file_glob: true
   file:
-  - "build/release/install/bin/mavsdk_server_bin.exe"
+  - "build/release/install/bin/mavsdk_server_win64.exe"
   on:
     repo: mavlink/MAVSDK
     tags: true
diff --git a/README.md b/README.md
index 542b88f36e..cfcbac7be6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 <img alt="MAVSDK" src="https://mavsdk.mavlink.io/develop/assets/site/sdk_logo_full.png" width="400">
 
 [![travis-ci build status](https://travis-ci.org/mavlink/MAVSDK.svg?branch=develop)](https://travis-ci.org/mavlink/MAVSDK)
-[![Build status](https://ci.appveyor.com/api/projects/status/1ntjvooywpxmoir8/branch/develop?svg=true)](https://ci.appveyor.com/project/Dronecode/dronecore/branch/develop)
 [![Coverage Status](https://coveralls.io/repos/github/mavlink/MAVSDK/badge.svg?branch=develop)](https://coveralls.io/github/mavlink/MAVSDK?branch=develop)
 
 ## Description
@@ -16,7 +15,7 @@ It aims to be:
 
 The core library is written in C++ and is used as the common "backend" to auto-generated front end libraries for different programming languages. The generated libraries share similar APIs (because they are autogenerated from a common interface) but follow idiomatic patterns expected by end users (for example, the Python library is installed from PyPi using *pip*, and includes everything you need to get up and running).
 
-This repo contains the source code for the C++ core. 
+This repo contains the source code for the C++ core.
 Other important repos include:
 - [MAVSDK-Proto](https://github.com/mavlink/MAVSDK-Proto) - Collection of proto files used by gRPC in MAVSDK (common interface definitions)
 - [MAVSDK-Python](https://github.com/mavlink/MAVSDK-Python) - MAVSDK client for Python
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 41dc574150..0000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-# Specify version format
-version: "{build}"
-
-# Operating system (build VM template)
-os: Visual Studio 2017
-
-# build platform, i.e. Win32 (instead of x86), x64, Any CPU. This setting is optional.
-platform:
-  - Win32
-  - x64
-
-environment:
-  CFLAGS: "-D_WIN32_WINNT=0x0600"
-  CXXFLAGS: "-D_WIN32_WINNT=0x0600"
-  MSVC_DEFAULT_OPTIONS: ON
-  matrix:
-      - COMPILER: mingw-64
-        GENERATOR: MinGW Makefiles
-#      - COMPILER: msvc2017
-#        GENERATOR: Visual Studio 15 2017
-#        APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-
-# only build PR but not branch as well
-skip_branch_with_pr: true
-
-# build configuration, i.e. Debug, Release, etc.
-configuration:
-  - Debug
-  - Release
-
-# scripts that are called at very beginning, before repo cloning
-init:
-  - cmake --version
-  - msbuild /version
-
-# clone directory
-clone_folder: C:\mavsdk
-
-# scripts to run before build
-before_build:
-  - if "%COMPILER%"=="mingw-64" set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
-  - if "%COMPILER%"=="mingw-64" set PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
-  - cd C:\mavsdk
-  - git submodule update --init --recursive --depth 200
-  - cd C:\
-
-build: on
-
-build_script:
-  - if "%COMPILER%"=="msvc2017" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
-  - set mavsdk_dir=C:\mavsdk
-  - cd %mavsdk_dir%
-  - cmake -DCMAKE_BUILD_TYPE="%configuration%" -G "%GENERATOR%" -DCMAKE_INSTALL_PREFIX=%mavsdk_dir%\install -DBUILD_BACKEND=ON -DBUILD_SHARED_LIBS=OFF -DENABLE_MAVLINK_PASSTHROUGH=ON -Bbuild -H.
-  - cmake --build build --target install --config %configuration% -j 2
-  - cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_PREFIX_PATH="%mavsdk_dir%\install;%mavsdk_dir%\build\third_party\install" -Bexample\build -Hexample
-  - cmake --build example\build --config %configuration% -j 2
-
-test: on
-
-test_script:
-  - cd %mavsdk_dir%
-  - build\src\unit_tests_runner.exe
-  - build\src\backend\test\unit_tests_backend.exe