diff --git a/.github/workflows/deploy-main-on-staging.yml b/.github/workflows/deploy-main-on-staging.yml
index f440cd375..e802aaea5 100644
--- a/.github/workflows/deploy-main-on-staging.yml
+++ b/.github/workflows/deploy-main-on-staging.yml
@@ -55,8 +55,8 @@ jobs:
           echo ${{ matrix.staging_servers.host_keys }} | base64 --decode > ~/.ssh/known_hosts
 
           # Wait for /var/lib/apt/lists/lock to be unlocked on the remote host via SSH.
-          while ssh root@${SERVER_IPV4} lsof /var/lib/apt/lists/lock; do sleep 1; done
+          while ssh root@${{ matrix.staging_servers.hostname }} lsof /var/lib/apt/lists/lock; do sleep 1; done
 
-          scp packaging/target/${{ matrix.staging_servers.package_name }} root@${SERVER_IPV4}:/opt
-          ssh root@${SERVER_IPV4} DEBIAN_FRONTEND=noninteractive "apt-get -o DPkg::Lock::Timeout=60 install -y /opt/${{ matrix.staging_servers.package_name }}"
+          scp packaging/target/${{ matrix.staging_servers.package_name }} root@${{ matrix.staging_servers.hostname }}:/opt
+          ssh root@${{ matrix.staging_servers.hostname }} DEBIAN_FRONTEND=noninteractive "apt-get -o DPkg::Lock::Timeout=60 install -y /opt/${{ matrix.staging_servers.package_name }}"