diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c50991ce9..3b69b6677 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -52,6 +52,11 @@ jobs:
       working-directory: ./openmptcprouter
       run: |
         make IGNORE_ERRORS=m -C $OMR_TARGET/source target/install -j$(nproc)
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: ${{ env.OMR_TARGET }}
+        path: ./openmptcprouter/${{ env.OMR_TARGET }}/source/bin
     - if: steps.branch_name.outputs.SOURCE_BRANCH == ''
       name: Deploy - Create directory
       uses: fifsky/ssh-action@master
@@ -82,7 +87,7 @@ jobs:
         key: ${{ secrets.PRIVATE_KEY }}
     - if: steps.branch_name.outputs.SOURCE_BRANCH == ''
       name: Deploy - Upload via rsync
-      uses: frankfoerster/github-actions-rsync@master
+      uses: galexrt/rsync-deployments@master
       with:
         RSYNC_OPTIONS: -av --delete-after
         RSYNC_TARGET: deploy/release/${{env.SOURCE_TAG}}/${{env.OMR_TARGET}}
@@ -91,12 +96,13 @@ jobs:
         SSH_PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
         SSH_USERNAME: deploy
         SSH_HOSTNAME: ${{ secrets.OMR_DEPLOY_HOST }}
+        SSH_PORT: ${{ secrets.OMR_DEPLOY_PORT }}
         SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }}
         SOURCE_BRANCH: ${{ steps.branch_name.outputs.SOURCE_BRANCH }}
         SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
     - if: steps.branch_name.outputs.SOURCE_BRANCH != ''
       name: Deploy - Upload via rsync
-      uses: frankfoerster/github-actions-rsync@master
+      uses: galexrt/rsync-deployments@master
       with:
         RSYNC_OPTIONS: -av --delete-after
         RSYNC_TARGET: deploy/${{env.SOURCE_BRANCH}}/${{env.OMR_KERNEL}}/${{env.OMR_TARGET}}
@@ -105,6 +111,7 @@ jobs:
         SSH_PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
         SSH_USERNAME: deploy
         SSH_HOSTNAME: ${{ secrets.OMR_DEPLOY_HOST }}
+        SSH_PORT: ${{ secrets.OMR_DEPLOY_PORT }}
         SOURCE_NAME: ${{ steps.branch_name.outputs.SOURCE_NAME }}
         SOURCE_BRANCH: ${{ steps.branch_name.outputs.SOURCE_BRANCH }}
         SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}