diff --git a/.github/workflows/deploy-app-staging.yml b/.github/workflows/deploy-app-staging.yml
index 312bc14a6..df384d3ef 100644
--- a/.github/workflows/deploy-app-staging.yml
+++ b/.github/workflows/deploy-app-staging.yml
@@ -37,7 +37,7 @@ jobs:
     - name: Syncing code to Toolforge-Staging
       uses: appleboy/scp-action@master
       with:
-        host: ${{ secrets.HOST }}
+        host: ${{ secrets.HOST_ALT }}
         username: ${{ secrets.USERNAME }}
         key: ${{ secrets.KEY }}
         passphrase: ${{ secrets.PASSPHRASE }}
@@ -48,10 +48,11 @@ jobs:
     - name: Deploy code
       uses: appleboy/ssh-action@master
       with:
-        host: ${{ secrets.HOST }}
+        host: ${{ secrets.HOST_ALT }}
         username: ${{ secrets.USERNAME }}
         key: ${{ secrets.KEY }}
         passphrase: ${{ secrets.PASSPHRASE }}
+        command_timeout: 30m
         script: |
           # Make sure ~tools.mismatch-finder-staging/mismatch-finder-repo-next is group writable
           become mismatch-finder-staging chmod -R g+rwx ~tools.mismatch-finder-staging/mismatch-finder-repo-next
diff --git a/.github/workflows/deploy-app.yml b/.github/workflows/deploy-app.yml
index 8fe1c2207..39c4dea07 100644
--- a/.github/workflows/deploy-app.yml
+++ b/.github/workflows/deploy-app.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Syncing code to Toolforge-Production
       uses: appleboy/scp-action@master
       with:
-        host: ${{ secrets.HOST }}
+        host: ${{ secrets.HOST_ALT }}
         username: ${{ secrets.USERNAME }}
         key: ${{ secrets.KEY }}
         passphrase: ${{ secrets.PASSPHRASE }}
@@ -46,10 +46,11 @@ jobs:
     - name: Deploy code
       uses: appleboy/ssh-action@master
       with:
-        host: ${{ secrets.HOST }}
+        host: ${{ secrets.HOST_ALT }}
         username: ${{ secrets.USERNAME }}
         key: ${{ secrets.KEY }}
         passphrase: ${{ secrets.PASSPHRASE }}
+        command_timeout: 30m
         script: |
           # Make sure ~tools.mismatch-finder/mismatch-finder-repo is group writable
           become mismatch-finder chmod -R g+rwx ~tools.mismatch-finder/mismatch-finder-repo