diff --git a/.travis.yml b/.travis.yml
index 4a76546f4..0be3fa93a 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,3 @@
-notifications:
-  irc: chat.freenode.net#reicast
 language: android
 android:
   components:
@@ -22,10 +20,6 @@ cache:
   - "$HOME/.gradle/wrapper/"
   - "$HOME/.android/build-cache"
 before_install:
-- test -z "$encrypted_c726d225a9d9_key" || openssl aes-256-cbc -K $encrypted_c726d225a9d9_key -iv $encrypted_c726d225a9d9_iv -in secure.tar.enc -out secure.tar -d
-- test -z "$encrypted_c726d225a9d9_key" || tar -xvf secure.tar
-- test -z "$encrypted_c726d225a9d9_key" || mv reicast-beta-cd.jks shell/android-studio/reicast-beta-cd.jks
-- test -z "$encrypted_c726d225a9d9_key" || mv reicast-beta-cd.p12 shell/android-studio/reicast-beta-cd.p12
 - GIT_HASH=`git log --pretty=format:'%h' -n 1`
 - GIT_BUILD=`git describe --all --always`-$GIT_HASH
 - mkdir "$ANDROID_HOME/licenses" || true
@@ -41,7 +35,6 @@ install:
 - export PATH=${PATH}:$ANDROID_HOME/platform-tools
 - export PATH=${PATH}:$NDK
 - mkdir -p ~/.android
-- test -z "$encrypted_c726d225a9d9_key" || mv debug.keystore ~/.android/debug.keystore
 before_script: 
 script:
 - git fetch --depth 250
@@ -49,22 +42,3 @@ script:
 - export NUMBER_OF_PROCESSORS=2
 - sudo chmod 755 travis-build.sh
 - "./travis-build.sh"
-- test -z "$encrypted_c726d225a9d9_key" || ./travis-release.sh
-before_deploy:
-- cd ../../
-- mkdir -p artifacts/$GIT_BUILD/
-- cp shell/android-studio/reicast/build/outputs/apk/dreamcast/debug/reicast-dreamcast-debug.apk artifacts/$GIT_BUILD/reicast-android-debug-$GIT_HASH.apk
-deploy:
-  provider: s3
-  access_key_id: AKIAJR5J3OHAQUP5BHHQ
-  secret_access_key:
-    secure: dDmBiadS1cc2XCWWDZ1kwZGIoLkwEOLsdi5nzVdn1dHMsEKxN3u+3WFuuOfJHZYcdrtN7VhojCarPa+eGDDeiVme4m3y+QKMbI9lecHX9+t4jDNUyYep5TpeIVUkZ7fj4JsMi7U9/YFBTg7QnqvVsMAHE9vobkvjegjAYToBrlM=
-  bucket: reicast-builds
-  local-dir: artifacts
-  upload-dir: builds
-  skip_cleanup: true
-  on:
-    all_branches: true
-    repo: reicast/reicast-emulator
-after_deploy:
-- echo "done"
diff --git a/appveyor.yml b/appveyor.yml
index dab32d51c..feb4e19bd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,39 +1,47 @@
 version: git-{branch}-{build}
 image: Visual Studio 2017
 
-environment:
-  matrix:
-  - EXTRA_PATH: C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin\
-    LAUNCH_BUILD: mingw32-make platform=win32
-    LAUNCH_PATH: shell\linux\
+configuration:
+- fast
+- RelWithDebInfo
 
+platform:
+- x64
+
+before_build:
+  - cmd: >-
+      if "%CONFIGURATION%"=="RelWithDebInfo" (set BUILD_PATH=build)
+      
+      if "%CONFIGURATION%"=="fast" (set BUILD_PATH=shell\linux)
+      
+      set EXTRA_PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin\
+      
+      set PATH=%EXTRA_PATH%;%PATH%
+      
+      if not exist %BUILD_PATH% (mkdir %BUILD_PATH%)
+     
+      if "%CONFIGURATION%"=="RelWithDebInfo" (cmake -B %BUILD_PATH% -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES=RelWithDebInfo)
+      
+      cd %BUILD_PATH%
+      
 build_script:
-- cmd: >-
-    set PATH=%EXTRA_PATH%;%PATH%
-    
-    cd %LAUNCH_PATH%
-    
-    %LAUNCH_BUILD%
-  
+  - cmd: >-
+      if "%CONFIGURATION%"=="RelWithDebInfo" (msbuild reicast.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll")
+      
+      if "%CONFIGURATION%"=="fast" (mingw32-make platform=win32)
+
 after_build:
-  - cmd: cd ..\..
-  - cmd: mkdir artifacts
-  - cmd: move shell\linux\reicast.exe artifacts/reicast-win_x64-fast-%APPVEYOR_REPO_COMMIT%.exe
-  - cmd: copy %EXTRA_PATH%\libgcc_s_seh-1.dll artifacts
-  - cmd: copy %EXTRA_PATH%\libwinpthread-1.dll artifacts
-  - cmd: copy %EXTRA_PATH%\libgomp-1.dll artifacts
+  - cmd: >-      
+      if "%CONFIGURATION%"=="RelWithDebInfo" (cd .. && set EXE_PATH=build\RelWithDebInfo\reicast.exe)
+      
+      if "%CONFIGURATION%"=="fast" (cd ..\.. && set EXE_PATH=shell\linux\nosym-reicast.exe)
+      
+      mkdir artifacts
+      
+      move %EXE_PATH% artifacts\reicast-win_%PLATFORM%-%CONFIGURATION%-%APPVEYOR_REPO_COMMIT%.exe
+      
+      if "%CONFIGURATION%"=="fast" (copy %EXTRA_PATH%\libgcc_s_seh-1.dll artifacts && copy %EXTRA_PATH%\libwinpthread-1.dll artifacts && copy %EXTRA_PATH%\libgomp-1.dll artifacts)
 
 artifacts:
   - path: artifacts
-    name: reicast-win_x64-fast-$(APPVEYOR_REPO_COMMIT)
-
-deploy:
-- provider: S3
-  access_key_id: AKIAJETEBUZSLZF3YNKA
-  secret_access_key:
-    secure: ZxrysCeqMK99dOOzKyoeN4R5aO8JjA4RTrwVAQPQHz8sjyyKuVDZT2fC+9m6lUIi
-  region: eu-west-1
-  bucket: reicast-builds-windows
-  folder: 'builds/heads/$(APPVEYOR_REPO_BRANCH)-$(APPVEYOR_REPO_COMMIT)'
-  artifact: reicast-win_x64-fast-$(APPVEYOR_REPO_COMMIT)
-  set_public: true
+    name: reicast-win_$(PLATFORM)-$(CONFIGURATION)-$(APPVEYOR_REPO_COMMIT)
diff --git a/bitrise.yml b/bitrise.yml
index a330c64b4..e29fae404 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -1,54 +1,66 @@
 ---
-format_version: '5'
+format_version: '7'
 default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git
-project_type: ios
+project_type: macos
 trigger_map:
 - push_branch: "*"
-  workflow: primary
+  workflow: deploy
 - pull_request_source_branch: "*"
-  workflow: primary
+  workflow: deploy
 workflows:
-  deploy:
+  deploy-naomi:
+    envs:
+    - opts:
+        is_expand: false
+      BITRISE_SCHEME: reicast-osx-naomi
     steps:
-    - activate-ssh-key@3.1.1:
+    - activate-ssh-key@4.0.3:
         run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
-    - git-clone@4.0.11: {}
+    - git-clone@4.0.14: {}
     - cache-pull@2.0.1: {}
     - script@1.1.5:
         title: Do anything with Script step
-    - certificate-and-profile-installer@1.9.3: {}
+    - certificate-and-profile-installer@1.10.1: {}
     - recreate-user-schemes@1.0.2:
         inputs:
         - project_path: "$BITRISE_PROJECT_PATH"
-    - xcode-archive@2.4.8:
+    - xcode-archive-mac@1.6.2:
         inputs:
         - project_path: "$BITRISE_PROJECT_PATH"
         - scheme: "$BITRISE_SCHEME"
         - export_method: "$BITRISE_EXPORT_METHOD"
-    - deploy-to-bitrise-io@1.3.12: {}
-    - cache-push@2.0.5: {}
-  primary:
+    - deploy-to-bitrise-io@1.3.19: {}
+    - cache-push@2.1.1: {}
+  deploy:
+    envs:
+    - opts:
+        is_expand: false
+      BITRISE_SCHEME: reicast-osx
     steps:
-    - activate-ssh-key@3.1.1:
+    - activate-ssh-key@4.0.3:
         run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}'
-    - git-clone@4.0.11: {}
+    - git-clone@4.0.14: {}
     - cache-pull@2.0.1: {}
     - script@1.1.5:
         title: Do anything with Script step
-    - certificate-and-profile-installer@1.9.2: {}
+    - certificate-and-profile-installer@1.10.1: {}
     - recreate-user-schemes@1.0.2:
         inputs:
         - project_path: "$BITRISE_PROJECT_PATH"
-    - deploy-to-bitrise-io@1.3.10: {}
-    - cache-push@2.0.5: {}
+    - xcode-archive-mac@1.6.2:
+        inputs:
+        - project_path: "$BITRISE_PROJECT_PATH"
+        - scheme: "$BITRISE_SCHEME"
+        - export_method: "$BITRISE_EXPORT_METHOD"
+    - deploy-to-bitrise-io@1.3.19: {}
+    - cache-push@2.1.1: {}
+    after_run:
+    - deploy-naomi
 app:
   envs:
   - opts:
       is_expand: false
-    BITRISE_PROJECT_PATH: shell/apple/emulator-ios/reicast-ios.xcodeproj
+    BITRISE_PROJECT_PATH: shell/apple/reicast.xcworkspace
   - opts:
       is_expand: false
-    BITRISE_SCHEME: reicast-ios
-  - opts:
-      is_expand: false
-    BITRISE_EXPORT_METHOD: ad-hoc
\ No newline at end of file
+    BITRISE_EXPORT_METHOD: none
diff --git a/shell/android-studio/travis-build.sh b/shell/android-studio/travis-build.sh
index 3e42bd164..fb16d017d 100755
--- a/shell/android-studio/travis-build.sh
+++ b/shell/android-studio/travis-build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -ev
-if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
-	./gradlew build  --configure-on-demand
-else
-	./gradlew assembleDebug  --configure-on-demand
-fi
+#if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
+#	./gradlew build  --configure-on-demand --console=plain
+#else
+	./gradlew assembleDebug  --configure-on-demand --console=plain
+#fi