diff --git a/e2e/framework/machinetemplate.go b/e2e/framework/machinetemplate.go
index cb470cf86..ca6fae8bb 100644
--- a/e2e/framework/machinetemplate.go
+++ b/e2e/framework/machinetemplate.go
@@ -56,7 +56,7 @@ func GetAWSMachineTemplateByPrefix(cl client.Client, prefix string, namespace st
 		return nil, nil
 	}
 	templateList := &awsv1.AWSMachineTemplateList{}
-	Eventually(komega.List(templateList, client.InNamespace(namespace))).Should(Succeed(), "failed to list AWSMachineTemplates in namespace %s.", namespace)
+	Eventually(komega.List(templateList, client.InNamespace(namespace)), time.Minute, RetryShort).Should(Succeed(), "failed to list AWSMachineTemplates in namespace %s.", namespace)
 
 	var matches []*awsv1.AWSMachineTemplate
 	for i, t := range templateList.Items {
@@ -81,7 +81,7 @@ func DeleteAWSMachineTemplateByPrefix(ctx context.Context, cl client.Client, pre
 		return nil
 	}
 	templateList := &awsv1.AWSMachineTemplateList{}
-	Eventually(komega.List(templateList, client.InNamespace(namespace))).Should(Succeed(), "failed to list AWSMachineTemplates in namespace %s.", namespace)
+	Eventually(komega.List(templateList, client.InNamespace(namespace)), time.Minute, RetryShort).Should(Succeed(), "failed to list AWSMachineTemplates in namespace %s.", namespace)
 
 	for i := range templateList.Items {
 		if strings.HasPrefix(templateList.Items[i].Name, prefix) {
diff --git a/e2e/machineset_migration_helpers.go b/e2e/machineset_migration_helpers.go
index a503eb983..699dc748c 100644
--- a/e2e/machineset_migration_helpers.go
+++ b/e2e/machineset_migration_helpers.go
@@ -173,12 +173,12 @@ func verifyMachinesetReplicas(machineSet client.Object, replicas int) {
 	switch ms := machineSet.(type) {
 	case *mapiv1beta1.MachineSet:
 		By(fmt.Sprintf("Verifying MAPI MachineSet status.Replicas is %d", replicas))
-		Eventually(komega.Object(ms), capiframework.WaitLong, capiframework.RetryLong).Should(
+		Eventually(komega.Object(ms), capiframework.WaitOverLong, capiframework.RetryLong).Should(
 			HaveField("Status.Replicas", Equal(int32(replicas))),
 			"Should have MAPI MachineSet %q replicas status eventually be %d", ms.Name, replicas)
 	case *clusterv1beta1.MachineSet:
 		By(fmt.Sprintf("Verifying CAPI MachineSet status.Replicas is %d", replicas))
-		Eventually(komega.Object(ms), capiframework.WaitLong, capiframework.RetryLong).Should(
+		Eventually(komega.Object(ms), capiframework.WaitOverLong, capiframework.RetryLong).Should(
 			HaveField("Status.Replicas", Equal(int32(replicas))),
 			"Should have CAPI MachineSet %q replicas status eventually be %d", ms.Name, replicas)
 	default: