diff --git a/controllers/awscluster_controller_test.go b/controllers/awscluster_controller_test.go
index db5516d809..a0034c83ef 100644
--- a/controllers/awscluster_controller_test.go
+++ b/controllers/awscluster_controller_test.go
@@ -1479,8 +1479,8 @@ func mockedDeleteVPCCalls(m *mocks.MockEC2APIMockRecorder) {
 	m.DescribeVpcEndpointsPages(gomock.Eq(&ec2.DescribeVpcEndpointsInput{
 		Filters: []*ec2.Filter{
 			{
-				Name:   aws.String("tag-key"),
-				Values: []*string{aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster")},
+				Name:   aws.String("tag:sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
+				Values: []*string{aws.String("owned")},
 			},
 			{
 				Name:   aws.String("vpc-id"),
diff --git a/pkg/cloud/services/network/vpc.go b/pkg/cloud/services/network/vpc.go
index 8b2d37cfe4..59a9481a68 100644
--- a/pkg/cloud/services/network/vpc.go
+++ b/pkg/cloud/services/network/vpc.go
@@ -277,7 +277,7 @@ func (s *Service) deleteVPCEndpoints() error {
 	}
 
 	// Get all existing endpoints.
-	endpoints, err := s.describeVPCEndpoints(filter.EC2.Cluster(s.scope.Name()))
+	endpoints, err := s.describeVPCEndpoints(filter.EC2.ClusterOwned(s.scope.Name()))
 	if err != nil {
 		return errors.Wrap(err, "failed to describe vpc endpoints")
 	}
diff --git a/test/e2e/shared/suite.go b/test/e2e/shared/suite.go
index ac410cb49a..ed280fe34c 100644
--- a/test/e2e/shared/suite.go
+++ b/test/e2e/shared/suite.go
@@ -145,7 +145,7 @@ func Node1BeforeSuite(e2eCtx *E2EContext) []byte {
 				success = false
 			}
 			return success
-		}, 30*time.Minute, 15*time.Second).Should(BeTrue(), "Should've eventually succeeded creating an AWS CloudFormation stack")
+		}, 10*time.Minute, 5*time.Second).Should(BeTrue(), "Should've eventually succeeded creating an AWS CloudFormation stack")
 	}
 
 	ensureStackTags(e2eCtx.AWSSession, bootstrapTemplate.Spec.StackName, bootstrapTags)