diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index cddb75846f7..cdd5244e876 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -64,19 +64,16 @@ jobs:
     - name: zip SDK
       id: package
       run: |
-        [[ $GITHUB_REF = refs/tags/* ]] && VERNAME=${GITHUB_REF##*/} || VERNAME="master2"
+        [[ $GITHUB_REF = refs/tags/* ]] && VERNAME=${GITHUB_REF##*/} || VERNAME="master"
         echo "::set-output name=ver::${VERNAME}"
         cd build/OgreJNI && zip -qr ogre-sdk-android-${VERNAME}-arm64-v8a.zip *
-    - uses: reznikmm/upload-bintray-action@v3
-      with:
-        sourcePath: build/OgreJNI/ogre-sdk-android-*-arm64-v8a.zip
-        username: paroj
-        apiKey: ${{ secrets.BINTRAY_API_KEY }}
-        subject: ogrecave
-        repository: ogre
-        package: ogre-sdk-android
-        version: ${{ steps.package.outputs.ver }}
-        override: 1
+    - name: upload artifact
+      run: |
+        test ! -n "$CLOUDSMITH_API_KEY" && exit 0
+        pip3 install --upgrade cloudsmith-cli
+        ~/.local/bin/cloudsmith push raw ogrecave/ogre build/OgreJNI/ogre-sdk-android-*-arm64-v8a.zip --republish -k $CLOUDSMITH_API_KEY
+      env:
+        CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
   macos:
     runs-on: macos-10.15
     steps:
diff --git a/appveyor.yml b/appveyor.yml
index 403e4108327..52e1d3f49e8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,42 +24,10 @@ branches:
     - master
     - stable
 after_build:
-  - IF "%APPVEYOR_REPO_TAG%" == "true" 7z a ogre-sdk-%APPVEYOR_REPO_TAG_NAME%-vc15-x64.zip ./build/sdk/*
-  - IF NOT "%APPVEYOR_REPO_TAG%" == "true" 7z a ogre-sdk-master-vc15-x64.zip ./build/sdk/*
+  - IF NOT "%APPVEYOR_REPO_TAG%" == "true" set APPVEYOR_REPO_TAG_NAME=master
+  - 7z a ogre-sdk-%APPVEYOR_REPO_TAG_NAME%-vc15-x64.zip ./build/sdk/*
   - pip install --upgrade cloudsmith-cli
-  - IF "%APPVEYOR_PULL_REQUEST_NUMBER%" == "" IF NOT "%APPVEYOR_REPO_TAG%" == "true" IF "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" cloudsmith push raw ogrecave/ogre ogre-sdk-master-vc15-x64.zip --republish -k %CS_APIKEY%
+  - IF "%APPVEYOR_PULL_REQUEST_NUMBER%" == "" IF "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" cloudsmith push raw ogrecave/ogre ogre-sdk-master-vc15-x64.zip --republish -k %CS_APIKEY%
 artifacts:
-  - path: build/sdk
-    name: ogre-sdk-master2-vc15-x64
-  - path: ogre-sdk-$(APPVEYOR_REPO_TAG_NAME)-vc15-x64.zip
-    name: ogre-sdk-$(APPVEYOR_REPO_TAG_NAME)-vc15-x64
-deploy:
-- provider: BinTray
-  username: paroj
-  api_key:
-    secure: 4nFEwKApbHUf7UajsDt6Z7QOl3zzgEz6YbWGSGx5AiPxozWEQHEyGc6c9xE7utWE
-  subject: ogrecave
-  repo: ogre
-  package: ogre-sdk-vc15-x64
-  artifact: ogre-sdk-master2-vc15-x64
-  publish: true
-  override: true
-  version: master2
-  on:
-    branch: master
-    APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
-    APPVEYOR_REPO_TAG: false
-- provider: BinTray
-  username: paroj
-  api_key:
-    secure: 4nFEwKApbHUf7UajsDt6Z7QOl3zzgEz6YbWGSGx5AiPxozWEQHEyGc6c9xE7utWE
-  subject: ogrecave
-  repo: ogre
-  package: ogre-sdk-vc15-x64
-  artifact: ogre-sdk-$(APPVEYOR_REPO_TAG_NAME)-vc15-x64
-  publish: true
-  override: true
-  version: $(APPVEYOR_REPO_TAG_NAME)
-  on:
-    APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
-    APPVEYOR_REPO_TAG: true
+  - path: ogre-sdk-master-vc15-x64.zip
+    name: ogre-sdk-master-vc15-x64