diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common
index af254790a..7dd2e89ce 100755
--- a/salt/common/tools/sbin/so-common
+++ b/salt/common/tools/sbin/so-common
@@ -144,10 +144,10 @@ get_random_value() {
 wait_for_apt() {
 	local progress_callback=$1
 
-	local retry_count=2
-	local retry_timeout='30s'
-	local lock_msg='Could not acquire dpkg lock, is another process using it?'
-	local retry_msg="Waiting $retry_timeout for dpkg lock to release."
+	local retry_count=30
+	local retry_timeout='10s'
+	local lock_msg='Could not acquire lock.'
+	local retry_msg="Waiting $retry_timeout for lock to release."
 	if [ -z "$progress_callback" ]; then
 		if [ -z "$progress_bar_text" ]; then
 			local old_text="Installing..."