diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml
index 1e08714..21233b1 100644
--- a/.gitea/workflows/publish.yml
+++ b/.gitea/workflows/publish.yml
@@ -40,16 +40,16 @@ jobs:
       - name: Build release binary
         run: cargo build --release -p ericrfb-proxy
 
-      - name: Set up SSH
+      - name: SSH init
         run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.PUBLISH_KEY }}" > ~/.ssh/id_ed25519
           chmod 600 ~/.ssh/id_ed25519
-          ssh-keyscan -H ${{ vars.WS_HOST }} >> ~/.ssh/known_hosts 2>/dev/null
+          ssh -o StrictHostKeyChecking=accept-new gitea_ci@${{ vars.WS_HOST }} exit
 
       - name: Stop service
         run: |
-          ssh gitea_ci@${{ vars.WS_HOST }} 'sudo /usr/bin/systemctl stop blekin.service' || true
+          ssh gitea_ci@${{ vars.WS_HOST }} 'if systemctl is-active --quiet blekin.service; then sudo /usr/bin/systemctl stop blekin.service; fi'
 
       - name: Deploy binary
         run: |
@@ -61,4 +61,4 @@ jobs:
 
       - name: Start and enable service
         run: |
-          ssh gitea_ci@${{ vars.WS_HOST }} 'sudo /usr/bin/systemctl enable blekin.service && sudo /usr/bin/systemctl start blekin.service'
+          ssh gitea_ci@${{ vars.WS_HOST }} 'sudo /usr/bin/systemctl start blekin.service && ( systemctl is-enabled --quiet blekin.service || sudo /usr/bin/systemctl enable blekin.service )'