diff --git a/.ci/azure-pipelines-package.yml b/.ci/azure-pipelines-package.yml
index 1677f71c75..ab752d0d93 100644
--- a/.ci/azure-pipelines-package.yml
+++ b/.ci/azure-pipelines-package.yml
@@ -116,6 +116,7 @@ jobs:
         $(JellyfinVersion)-$(BuildConfiguration)
 
 - job: CollectArtifacts
+  timeoutInMinutes: 10
   displayName: 'Collect Artifacts'
   dependsOn:
   - BuildPackage
@@ -131,29 +132,25 @@ jobs:
     condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/master')
     inputs:
       sshEndpoint: repository
-      runOptions: 'inline'
-      inline: |
-        sudo /srv/repository/collect-server.azure.sh /srv/repository/incoming/azure $(Build.BuildNumber) unstable
-        rm $0
-        exit
+      runOptions: 'commands'
+      commands: sudo -n /srv/repository/collect-server.azure.sh
+      args: /srv/repository/incoming/azure $(Build.BuildNumber) unstable
 
   - task: SSH@0
     displayName: 'Update Stable Repository'
     condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
     inputs:
       sshEndpoint: repository
-      runOptions: 'inline'
-      inline: |
-        sudo /srv/repository/collect-server.azure.sh /srv/repository/incoming/azure $(Build.BuildNumber)
-        rm $0
-        exit
+      runOptions: 'commands'
+      commands: sudo -n /srv/repository/collect-server.azure.sh
+      args: /srv/repository/incoming/azure $(Build.BuildNumber)
 
 - job: PublishNuget
   displayName: 'Publish NuGet packages'
   dependsOn:
   - BuildPackage
   condition: and(succeeded('BuildPackage'), startsWith(variables['Build.SourceBranch'], 'refs/tags'))
-  
+
   pool:
     vmImage: 'ubuntu-latest'