diff --git a/go.mod b/go.mod
index d7993f6c..de253a15 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.22
 toolchain go1.22.0
 
 require (
-	github.com/avast/retry-go/v4 v4.5.1
+	github.com/avast/retry-go/v4 v4.6.0
 	github.com/brianvoe/gofakeit/v7 v7.0.2
 	github.com/google/go-cmp v0.6.0
 	github.com/google/go-querystring v1.1.0
diff --git a/go.sum b/go.sum
index 19e1b86c..5759f86c 100644
--- a/go.sum
+++ b/go.sum
@@ -9,8 +9,8 @@ github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki
 github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
 github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
 github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
-github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh7o=
-github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
+github.com/avast/retry-go/v4 v4.6.0 h1:K9xNA+KeB8HHc2aWFuLb25Offp+0iVRXEvFx8IinRJA=
+github.com/avast/retry-go/v4 v4.6.0/go.mod h1:gvWlPhBVsvBbLkVGDg/KwvBv0bEkCOLRRSHKIr2PyOE=
 github.com/brianvoe/gofakeit/v7 v7.0.2 h1:jzYT7Ge3RDHw7J1CM1kwu0OQywV9vbf2qSGxBS72TCY=
 github.com/brianvoe/gofakeit/v7 v7.0.2/go.mod h1:QXuPeBw164PJCzCUZVmgpgHJ3Llj49jSLVkKPMtxtxA=
 github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
diff --git a/proxmox/nodes/containers/containers.go b/proxmox/nodes/containers/containers.go
index b48bc745..d0788d94 100644
--- a/proxmox/nodes/containers/containers.go
+++ b/proxmox/nodes/containers/containers.go
@@ -211,7 +211,7 @@ func (c *Client) WaitForContainerStatus(ctx context.Context, status string) erro
 		retry.RetryIf(func(err error) bool {
 			return errors.Is(err, unexpectedStatus)
 		}),
-		retry.Attempts(0), // retry until context deadline
+		retry.UntilSucceeded(),
 		retry.Delay(1*time.Second),
 		retry.LastErrorOnly(true),
 	)
@@ -248,7 +248,7 @@ func (c *Client) WaitForContainerConfigUnlock(ctx context.Context, ignoreErrorRe
 		retry.RetryIf(func(err error) bool {
 			return errors.Is(err, stillLocked) || ignoreErrorResponse
 		}),
-		retry.Attempts(0), // retry until context deadline
+		retry.UntilSucceeded(),
 		retry.Delay(1*time.Second),
 		retry.LastErrorOnly(true),
 	)
diff --git a/proxmox/nodes/tasks/tasks.go b/proxmox/nodes/tasks/tasks.go
index 248bc694..68cf2dfb 100644
--- a/proxmox/nodes/tasks/tasks.go
+++ b/proxmox/nodes/tasks/tasks.go
@@ -118,7 +118,7 @@ func (c *Client) WaitForTask(ctx context.Context, upid string) error {
 			return errors.Is(err, errStillRunning)
 		}),
 		retry.LastErrorOnly(true),
-		retry.Attempts(0), // retry until context deadline
+		retry.UntilSucceeded(),
 		retry.DelayType(retry.FixedDelay),
 		retry.Delay(time.Second),
 	)
diff --git a/proxmox/nodes/vms/vms.go b/proxmox/nodes/vms/vms.go
index 19338663..4368164e 100644
--- a/proxmox/nodes/vms/vms.go
+++ b/proxmox/nodes/vms/vms.go
@@ -576,7 +576,7 @@ func (c *Client) WaitForVMConfigUnlock(ctx context.Context, ignoreErrorResponse
 		retry.RetryIf(func(err error) bool {
 			return errors.Is(err, stillLocked) || ignoreErrorResponse
 		}),
-		retry.Attempts(0), // retry until context deadline
+		retry.UntilSucceeded(),
 		retry.Delay(1*time.Second),
 		retry.LastErrorOnly(true),
 	)
@@ -615,7 +615,7 @@ func (c *Client) WaitForVMStatus(ctx context.Context, status string) error {
 		retry.RetryIf(func(err error) bool {
 			return errors.Is(err, unexpectedStatus)
 		}),
-		retry.Attempts(0), // retry until context deadline
+		retry.UntilSucceeded(),
 		retry.Delay(1*time.Second),
 		retry.LastErrorOnly(true),
 	)