diff --git a/share/pkgs/services/supervisor/centos8/scripts/lib/functions.sh b/share/pkgs/services/supervisor/centos8/scripts/lib/functions.sh
index b942fd34c2..2f4ca47fd1 100644
--- a/share/pkgs/services/supervisor/centos8/scripts/lib/functions.sh
+++ b/share/pkgs/services/supervisor/centos8/scripts/lib/functions.sh
@@ -79,22 +79,6 @@ wait_for_memcached()
     return 1
 )
 
-wait_for_ssh_agent()
-(
-    TIMEOUT="${TIMEOUT:-120}"
-
-    while [ "$TIMEOUT" -gt 0 ] ; do
-        if [ -e ${SSH_AUTH_SOCK} ] ; then
-            return 0
-        fi
-
-        TIMEOUT=$(( TIMEOUT - 1 ))
-        sleep 1
-    done
-
-    return 1
-)
-
 wait_for_mysqld()
 (
     TIMEOUT="${TIMEOUT:-120}"
diff --git a/share/pkgs/services/supervisor/centos8/scripts/opennebula-ssh-add.sh b/share/pkgs/services/supervisor/centos8/scripts/opennebula-ssh-add.sh
index e3260b8aac..e0368699bc 100755
--- a/share/pkgs/services/supervisor/centos8/scripts/opennebula-ssh-add.sh
+++ b/share/pkgs/services/supervisor/centos8/scripts/opennebula-ssh-add.sh
@@ -33,7 +33,7 @@ export SSH_AUTH_SOCK
 
 # wait for ssh-agent socket
 msg "Wait for ssh-agent (${SSH_AUTH_SOCK})..."
-if ! wait_for_ssh_agent ; then
+if ! wait_for_file "${SSH_AUTH_SOCK}" ; then
     err "Timeout!"
     exit 1
 fi
diff --git a/share/pkgs/services/supervisor/centos8/scripts/opennebula.sh b/share/pkgs/services/supervisor/centos8/scripts/opennebula.sh
index 7e8761ea06..54479db2be 100755
--- a/share/pkgs/services/supervisor/centos8/scripts/opennebula.sh
+++ b/share/pkgs/services/supervisor/centos8/scripts/opennebula.sh
@@ -25,6 +25,13 @@ do
     fi
 done
 
+# wait for ssh-agent to start
+msg "Wait for ssh-agent (/var/run/one/ssh-agent.env)..."
+if ! wait_for_file "/var/run/one/ssh-agent.env" ; then
+    err "Timeout!"
+    exit 1
+fi
+
 #
 # run service
 #