diff --git a/.github/workflows/images-debian.yml b/.github/workflows/images-debian.yml
index b544443..53aa6ca 100644
--- a/.github/workflows/images-debian.yml
+++ b/.github/workflows/images-debian.yml
@@ -40,8 +40,7 @@ jobs:
           sleep 1s
         done
 
-        sleep 5m
-        ssh root@$IP pkill apt-get || true
+        ssh root@$IP "cloud-init status --wait"
 
         ssh root@$IP apt-get update
         ssh root@$IP apt-get install -y git podman s3cmd
diff --git a/.github/workflows/images-oraclelinux.yml b/.github/workflows/images-oraclelinux.yml
index 1ecfda4..0fc6e7b 100644
--- a/.github/workflows/images-oraclelinux.yml
+++ b/.github/workflows/images-oraclelinux.yml
@@ -40,8 +40,7 @@ jobs:
           sleep 1s
         done
 
-        sleep 5m
-        ssh root@$IP pkill apt-get || true
+        ssh root@$IP "cloud-init status --wait"
 
         ssh root@$IP apt-get update
         ssh root@$IP apt-get install -y git podman s3cmd