diff --git a/apis/ecs/v1beta1/zz_generated.deepcopy.go b/apis/ecs/v1beta1/zz_generated.deepcopy.go
index 38bd08af..06a4b244 100644
--- a/apis/ecs/v1beta1/zz_generated.deepcopy.go
+++ b/apis/ecs/v1beta1/zz_generated.deepcopy.go
@@ -947,6 +947,11 @@ func (in *NetworkObservation) DeepCopyInto(out *NetworkObservation) {
 		*out = new(string)
 		**out = **in
 	}
+	if in.Port != nil {
+		in, out := &in.Port, &out.Port
+		*out = new(string)
+		**out = **in
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NetworkObservation.
@@ -982,21 +987,6 @@ func (in *NetworkParameters) DeepCopyInto(out *NetworkParameters) {
 		*out = new(string)
 		**out = **in
 	}
-	if in.Port != nil {
-		in, out := &in.Port, &out.Port
-		*out = new(string)
-		**out = **in
-	}
-	if in.PortRef != nil {
-		in, out := &in.PortRef, &out.PortRef
-		*out = new(v1.Reference)
-		(*in).DeepCopyInto(*out)
-	}
-	if in.PortSelector != nil {
-		in, out := &in.PortSelector, &out.PortSelector
-		*out = new(v1.Selector)
-		(*in).DeepCopyInto(*out)
-	}
 	if in.UUID != nil {
 		in, out := &in.UUID, &out.UUID
 		*out = new(string)
diff --git a/apis/ecs/v1beta1/zz_generated.resolvers.go b/apis/ecs/v1beta1/zz_generated.resolvers.go
index d66244de..8d788474 100644
--- a/apis/ecs/v1beta1/zz_generated.resolvers.go
+++ b/apis/ecs/v1beta1/zz_generated.resolvers.go
@@ -113,24 +113,6 @@ func (mg *Instance) ResolveReferences(ctx context.Context, c client.Reader) erro
 	mg.Spec.ForProvider.KeyPair = reference.ToPtrValue(rsp.ResolvedValue)
 	mg.Spec.ForProvider.KeyPairRef = rsp.ResolvedReference
 
-	for i3 := 0; i3 < len(mg.Spec.ForProvider.Network); i3++ {
-		rsp, err = r.Resolve(ctx, reference.ResolutionRequest{
-			CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.Network[i3].Port),
-			Extract:      reference.ExternalName(),
-			Reference:    mg.Spec.ForProvider.Network[i3].PortRef,
-			Selector:     mg.Spec.ForProvider.Network[i3].PortSelector,
-			To: reference.To{
-				List:    &v1beta12.PortList{},
-				Managed: &v1beta12.Port{},
-			},
-		})
-		if err != nil {
-			return errors.Wrap(err, "mg.Spec.ForProvider.Network[i3].Port")
-		}
-		mg.Spec.ForProvider.Network[i3].Port = reference.ToPtrValue(rsp.ResolvedValue)
-		mg.Spec.ForProvider.Network[i3].PortRef = rsp.ResolvedReference
-
-	}
 	for i3 := 0; i3 < len(mg.Spec.ForProvider.Network); i3++ {
 		rsp, err = r.Resolve(ctx, reference.ResolutionRequest{
 			CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.Network[i3].UUID),
diff --git a/apis/ecs/v1beta1/zz_instance_types.go b/apis/ecs/v1beta1/zz_instance_types.go
index 98b2e246..2f0fc0a4 100755
--- a/apis/ecs/v1beta1/zz_instance_types.go
+++ b/apis/ecs/v1beta1/zz_instance_types.go
@@ -244,6 +244,10 @@ type InstanceParameters struct {
 
 type NetworkObservation struct {
 	Mac *string `json:"mac,omitempty" tf:"mac,omitempty"`
+
+	// The port UUID of a network to
+	// attach to the server. Changing this creates a new server.
+	Port *string `json:"port,omitempty" tf:"port,omitempty"`
 }
 
 type NetworkParameters struct {
@@ -267,20 +271,6 @@ type NetworkParameters struct {
 	// +kubebuilder:validation:Optional
 	Name *string `json:"name,omitempty" tf:"name,omitempty"`
 
-	// The port UUID of a network to
-	// attach to the server. Changing this creates a new server.
-	// +crossplane:generate:reference:type=github.com/FrangipaneTeam/provider-flexibleengine/apis/vpc/v1beta1.Port
-	// +kubebuilder:validation:Optional
-	Port *string `json:"port,omitempty" tf:"port,omitempty"`
-
-	// Reference to a Port in vpc to populate port.
-	// +kubebuilder:validation:Optional
-	PortRef *v1.Reference `json:"portRef,omitempty" tf:"-"`
-
-	// Selector for a Port in vpc to populate port.
-	// +kubebuilder:validation:Optional
-	PortSelector *v1.Selector `json:"portSelector,omitempty" tf:"-"`
-
 	// The network UUID to
 	// attach to the server. Changing this creates a new server.
 	// +crossplane:generate:reference:type=github.com/FrangipaneTeam/provider-flexibleengine/apis/vpc/v1beta1.VPCSubnet
diff --git a/apis/vpcep/v1beta1/zz_approval_types.go b/apis/vpcep/v1beta1/zz_approval_types.go
index 4db19a0f..fada1a8c 100755
--- a/apis/vpcep/v1beta1/zz_approval_types.go
+++ b/apis/vpcep/v1beta1/zz_approval_types.go
@@ -43,15 +43,15 @@ type ApprovalParameters struct {
 	Region *string `json:"region,omitempty" tf:"region,omitempty"`
 
 	// Specifies the ID of the VPC endpoint service. Changing this creates a new resource.
-	// +crossplane:generate:reference:type=Service
+	// +crossplane:generate:reference:type=VPCEPService
 	// +kubebuilder:validation:Optional
 	ServiceID *string `json:"serviceId,omitempty" tf:"service_id,omitempty"`
 
-	// Reference to a Service to populate serviceId.
+	// Reference to a VPCEPService to populate serviceId.
 	// +kubebuilder:validation:Optional
 	ServiceIDRef *v1.Reference `json:"serviceIdRef,omitempty" tf:"-"`
 
-	// Selector for a Service to populate serviceId.
+	// Selector for a VPCEPService to populate serviceId.
 	// +kubebuilder:validation:Optional
 	ServiceIDSelector *v1.Selector `json:"serviceIdSelector,omitempty" tf:"-"`
 }
diff --git a/apis/vpcep/v1beta1/zz_endpoint_types.go b/apis/vpcep/v1beta1/zz_endpoint_types.go
index 362c2a53..9d72706c 100755
--- a/apis/vpcep/v1beta1/zz_endpoint_types.go
+++ b/apis/vpcep/v1beta1/zz_endpoint_types.go
@@ -73,15 +73,15 @@ type EndpointParameters struct {
 
 	// Specifies the ID of the VPC endpoint service.
 	// Changing this creates a new VPC endpoint.
-	// +crossplane:generate:reference:type=Service
+	// +crossplane:generate:reference:type=VPCEPService
 	// +kubebuilder:validation:Optional
 	ServiceID *string `json:"serviceId,omitempty" tf:"service_id,omitempty"`
 
-	// Reference to a Service to populate serviceId.
+	// Reference to a VPCEPService to populate serviceId.
 	// +kubebuilder:validation:Optional
 	ServiceIDRef *v1.Reference `json:"serviceIdRef,omitempty" tf:"-"`
 
-	// Selector for a Service to populate serviceId.
+	// Selector for a VPCEPService to populate serviceId.
 	// +kubebuilder:validation:Optional
 	ServiceIDSelector *v1.Selector `json:"serviceIdSelector,omitempty" tf:"-"`
 
diff --git a/apis/vpcep/v1beta1/zz_generated.deepcopy.go b/apis/vpcep/v1beta1/zz_generated.deepcopy.go
index 3d1d3223..40bdc367 100644
--- a/apis/vpcep/v1beta1/zz_generated.deepcopy.go
+++ b/apis/vpcep/v1beta1/zz_generated.deepcopy.go
@@ -532,7 +532,7 @@ func (in *PortMappingParameters) DeepCopy() *PortMappingParameters {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Service) DeepCopyInto(out *Service) {
+func (in *VPCEPService) DeepCopyInto(out *VPCEPService) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
@@ -540,18 +540,18 @@ func (in *Service) DeepCopyInto(out *Service) {
 	in.Status.DeepCopyInto(&out.Status)
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Service.
-func (in *Service) DeepCopy() *Service {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VPCEPService.
+func (in *VPCEPService) DeepCopy() *VPCEPService {
 	if in == nil {
 		return nil
 	}
-	out := new(Service)
+	out := new(VPCEPService)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Service) DeepCopyObject() runtime.Object {
+func (in *VPCEPService) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -559,7 +559,7 @@ func (in *Service) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ServiceConnectionsObservation) DeepCopyInto(out *ServiceConnectionsObservation) {
+func (in *VPCEPServiceConnectionsObservation) DeepCopyInto(out *VPCEPServiceConnectionsObservation) {
 	*out = *in
 	if in.DomainID != nil {
 		in, out := &in.DomainID, &out.DomainID
@@ -583,57 +583,57 @@ func (in *ServiceConnectionsObservation) DeepCopyInto(out *ServiceConnectionsObs
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceConnectionsObservation.
-func (in *ServiceConnectionsObservation) DeepCopy() *ServiceConnectionsObservation {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VPCEPServiceConnectionsObservation.
+func (in *VPCEPServiceConnectionsObservation) DeepCopy() *VPCEPServiceConnectionsObservation {
 	if in == nil {
 		return nil
 	}
-	out := new(ServiceConnectionsObservation)
+	out := new(VPCEPServiceConnectionsObservation)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ServiceConnectionsParameters) DeepCopyInto(out *ServiceConnectionsParameters) {
+func (in *VPCEPServiceConnectionsParameters) DeepCopyInto(out *VPCEPServiceConnectionsParameters) {
 	*out = *in
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceConnectionsParameters.
-func (in *ServiceConnectionsParameters) DeepCopy() *ServiceConnectionsParameters {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VPCEPServiceConnectionsParameters.
+func (in *VPCEPServiceConnectionsParameters) DeepCopy() *VPCEPServiceConnectionsParameters {
 	if in == nil {
 		return nil
 	}
-	out := new(ServiceConnectionsParameters)
+	out := new(VPCEPServiceConnectionsParameters)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ServiceList) DeepCopyInto(out *ServiceList) {
+func (in *VPCEPServiceList) DeepCopyInto(out *VPCEPServiceList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
-		*out = make([]Service, len(*in))
+		*out = make([]VPCEPService, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceList.
-func (in *ServiceList) DeepCopy() *ServiceList {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VPCEPServiceList.
+func (in *VPCEPServiceList) DeepCopy() *VPCEPServiceList {
 	if in == nil {
 		return nil
 	}
-	out := new(ServiceList)
+	out := new(VPCEPServiceList)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *ServiceList) DeepCopyObject() runtime.Object {
+func (in *VPCEPServiceList) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -641,11 +641,11 @@ func (in *ServiceList) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ServiceObservation) DeepCopyInto(out *ServiceObservation) {
+func (in *VPCEPServiceObservation) DeepCopyInto(out *VPCEPServiceObservation) {
 	*out = *in
 	if in.Connections != nil {
 		in, out := &in.Connections, &out.Connections
-		*out = make([]ServiceConnectionsObservation, len(*in))
+		*out = make([]VPCEPServiceConnectionsObservation, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -667,18 +667,18 @@ func (in *ServiceObservation) DeepCopyInto(out *ServiceObservation) {
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceObservation.
-func (in *ServiceObservation) DeepCopy() *ServiceObservation {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VPCEPServiceObservation.
+func (in *VPCEPServiceObservation) DeepCopy() *VPCEPServiceObservation {
 	if in == nil {
 		return nil
 	}
-	out := new(ServiceObservation)
+	out := new(VPCEPServiceObservation)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ServiceParameters) DeepCopyInto(out *ServiceParameters) {
+func (in *VPCEPServiceParameters) DeepCopyInto(out *VPCEPServiceParameters) {
 	*out = *in
 	if in.Approval != nil {
 		in, out := &in.Approval, &out.Approval
@@ -770,46 +770,46 @@ func (in *ServiceParameters) DeepCopyInto(out *ServiceParameters) {
 	}
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceParameters.
-func (in *ServiceParameters) DeepCopy() *ServiceParameters {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VPCEPServiceParameters.
+func (in *VPCEPServiceParameters) DeepCopy() *VPCEPServiceParameters {
 	if in == nil {
 		return nil
 	}
-	out := new(ServiceParameters)
+	out := new(VPCEPServiceParameters)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ServiceSpec) DeepCopyInto(out *ServiceSpec) {
+func (in *VPCEPServiceSpec) DeepCopyInto(out *VPCEPServiceSpec) {
 	*out = *in
 	in.ResourceSpec.DeepCopyInto(&out.ResourceSpec)
 	in.ForProvider.DeepCopyInto(&out.ForProvider)
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceSpec.
-func (in *ServiceSpec) DeepCopy() *ServiceSpec {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VPCEPServiceSpec.
+func (in *VPCEPServiceSpec) DeepCopy() *VPCEPServiceSpec {
 	if in == nil {
 		return nil
 	}
-	out := new(ServiceSpec)
+	out := new(VPCEPServiceSpec)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ServiceStatus) DeepCopyInto(out *ServiceStatus) {
+func (in *VPCEPServiceStatus) DeepCopyInto(out *VPCEPServiceStatus) {
 	*out = *in
 	in.ResourceStatus.DeepCopyInto(&out.ResourceStatus)
 	in.AtProvider.DeepCopyInto(&out.AtProvider)
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ServiceStatus.
-func (in *ServiceStatus) DeepCopy() *ServiceStatus {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new VPCEPServiceStatus.
+func (in *VPCEPServiceStatus) DeepCopy() *VPCEPServiceStatus {
 	if in == nil {
 		return nil
 	}
-	out := new(ServiceStatus)
+	out := new(VPCEPServiceStatus)
 	in.DeepCopyInto(out)
 	return out
 }
diff --git a/apis/vpcep/v1beta1/zz_generated.managed.go b/apis/vpcep/v1beta1/zz_generated.managed.go
index fbd9e411..ddfee875 100644
--- a/apis/vpcep/v1beta1/zz_generated.managed.go
+++ b/apis/vpcep/v1beta1/zz_generated.managed.go
@@ -139,68 +139,68 @@ func (mg *Endpoint) SetWriteConnectionSecretToReference(r *xpv1.SecretReference)
 	mg.Spec.WriteConnectionSecretToReference = r
 }
 
-// GetCondition of this Service.
-func (mg *Service) GetCondition(ct xpv1.ConditionType) xpv1.Condition {
+// GetCondition of this VPCEPService.
+func (mg *VPCEPService) GetCondition(ct xpv1.ConditionType) xpv1.Condition {
 	return mg.Status.GetCondition(ct)
 }
 
-// GetDeletionPolicy of this Service.
-func (mg *Service) GetDeletionPolicy() xpv1.DeletionPolicy {
+// GetDeletionPolicy of this VPCEPService.
+func (mg *VPCEPService) GetDeletionPolicy() xpv1.DeletionPolicy {
 	return mg.Spec.DeletionPolicy
 }
 
-// GetProviderConfigReference of this Service.
-func (mg *Service) GetProviderConfigReference() *xpv1.Reference {
+// GetProviderConfigReference of this VPCEPService.
+func (mg *VPCEPService) GetProviderConfigReference() *xpv1.Reference {
 	return mg.Spec.ProviderConfigReference
 }
 
 /*
-GetProviderReference of this Service.
+GetProviderReference of this VPCEPService.
 Deprecated: Use GetProviderConfigReference.
 */
-func (mg *Service) GetProviderReference() *xpv1.Reference {
+func (mg *VPCEPService) GetProviderReference() *xpv1.Reference {
 	return mg.Spec.ProviderReference
 }
 
-// GetPublishConnectionDetailsTo of this Service.
-func (mg *Service) GetPublishConnectionDetailsTo() *xpv1.PublishConnectionDetailsTo {
+// GetPublishConnectionDetailsTo of this VPCEPService.
+func (mg *VPCEPService) GetPublishConnectionDetailsTo() *xpv1.PublishConnectionDetailsTo {
 	return mg.Spec.PublishConnectionDetailsTo
 }
 
-// GetWriteConnectionSecretToReference of this Service.
-func (mg *Service) GetWriteConnectionSecretToReference() *xpv1.SecretReference {
+// GetWriteConnectionSecretToReference of this VPCEPService.
+func (mg *VPCEPService) GetWriteConnectionSecretToReference() *xpv1.SecretReference {
 	return mg.Spec.WriteConnectionSecretToReference
 }
 
-// SetConditions of this Service.
-func (mg *Service) SetConditions(c ...xpv1.Condition) {
+// SetConditions of this VPCEPService.
+func (mg *VPCEPService) SetConditions(c ...xpv1.Condition) {
 	mg.Status.SetConditions(c...)
 }
 
-// SetDeletionPolicy of this Service.
-func (mg *Service) SetDeletionPolicy(r xpv1.DeletionPolicy) {
+// SetDeletionPolicy of this VPCEPService.
+func (mg *VPCEPService) SetDeletionPolicy(r xpv1.DeletionPolicy) {
 	mg.Spec.DeletionPolicy = r
 }
 
-// SetProviderConfigReference of this Service.
-func (mg *Service) SetProviderConfigReference(r *xpv1.Reference) {
+// SetProviderConfigReference of this VPCEPService.
+func (mg *VPCEPService) SetProviderConfigReference(r *xpv1.Reference) {
 	mg.Spec.ProviderConfigReference = r
 }
 
 /*
-SetProviderReference of this Service.
+SetProviderReference of this VPCEPService.
 Deprecated: Use SetProviderConfigReference.
 */
-func (mg *Service) SetProviderReference(r *xpv1.Reference) {
+func (mg *VPCEPService) SetProviderReference(r *xpv1.Reference) {
 	mg.Spec.ProviderReference = r
 }
 
-// SetPublishConnectionDetailsTo of this Service.
-func (mg *Service) SetPublishConnectionDetailsTo(r *xpv1.PublishConnectionDetailsTo) {
+// SetPublishConnectionDetailsTo of this VPCEPService.
+func (mg *VPCEPService) SetPublishConnectionDetailsTo(r *xpv1.PublishConnectionDetailsTo) {
 	mg.Spec.PublishConnectionDetailsTo = r
 }
 
-// SetWriteConnectionSecretToReference of this Service.
-func (mg *Service) SetWriteConnectionSecretToReference(r *xpv1.SecretReference) {
+// SetWriteConnectionSecretToReference of this VPCEPService.
+func (mg *VPCEPService) SetWriteConnectionSecretToReference(r *xpv1.SecretReference) {
 	mg.Spec.WriteConnectionSecretToReference = r
 }
diff --git a/apis/vpcep/v1beta1/zz_generated.managedlist.go b/apis/vpcep/v1beta1/zz_generated.managedlist.go
index c1a1be40..ce27e262 100644
--- a/apis/vpcep/v1beta1/zz_generated.managedlist.go
+++ b/apis/vpcep/v1beta1/zz_generated.managedlist.go
@@ -25,8 +25,8 @@ func (l *EndpointList) GetItems() []resource.Managed {
 	return items
 }
 
-// GetItems of this ServiceList.
-func (l *ServiceList) GetItems() []resource.Managed {
+// GetItems of this VPCEPServiceList.
+func (l *VPCEPServiceList) GetItems() []resource.Managed {
 	items := make([]resource.Managed, len(l.Items))
 	for i := range l.Items {
 		items[i] = &l.Items[i]
diff --git a/apis/vpcep/v1beta1/zz_generated.resolvers.go b/apis/vpcep/v1beta1/zz_generated.resolvers.go
index 76d7e97e..7b7c7bc2 100644
--- a/apis/vpcep/v1beta1/zz_generated.resolvers.go
+++ b/apis/vpcep/v1beta1/zz_generated.resolvers.go
@@ -7,6 +7,7 @@ package v1beta1
 
 import (
 	"context"
+	v1beta11 "github.com/FrangipaneTeam/provider-flexibleengine/apis/ecs/v1beta1"
 	v1beta1 "github.com/FrangipaneTeam/provider-flexibleengine/apis/vpc/v1beta1"
 	common "github.com/FrangipaneTeam/provider-flexibleengine/config/common"
 	reference "github.com/crossplane/crossplane-runtime/pkg/reference"
@@ -44,8 +45,8 @@ func (mg *Approval) ResolveReferences(ctx context.Context, c client.Reader) erro
 		Reference:    mg.Spec.ForProvider.ServiceIDRef,
 		Selector:     mg.Spec.ForProvider.ServiceIDSelector,
 		To: reference.To{
-			List:    &ServiceList{},
-			Managed: &Service{},
+			List:    &VPCEPServiceList{},
+			Managed: &VPCEPService{},
 		},
 	})
 	if err != nil {
@@ -86,8 +87,8 @@ func (mg *Endpoint) ResolveReferences(ctx context.Context, c client.Reader) erro
 		Reference:    mg.Spec.ForProvider.ServiceIDRef,
 		Selector:     mg.Spec.ForProvider.ServiceIDSelector,
 		To: reference.To{
-			List:    &ServiceList{},
-			Managed: &Service{},
+			List:    &VPCEPServiceList{},
+			Managed: &VPCEPService{},
 		},
 	})
 	if err != nil {
@@ -115,8 +116,8 @@ func (mg *Endpoint) ResolveReferences(ctx context.Context, c client.Reader) erro
 	return nil
 }
 
-// ResolveReferences of this Service.
-func (mg *Service) ResolveReferences(ctx context.Context, c client.Reader) error {
+// ResolveReferences of this VPCEPService.
+func (mg *VPCEPService) ResolveReferences(ctx context.Context, c client.Reader) error {
 	r := reference.NewAPIResolver(c, mg)
 
 	var rsp reference.ResolutionResponse
@@ -124,12 +125,12 @@ func (mg *Service) ResolveReferences(ctx context.Context, c client.Reader) error
 
 	rsp, err = r.Resolve(ctx, reference.ResolutionRequest{
 		CurrentValue: reference.FromPtrValue(mg.Spec.ForProvider.PortID),
-		Extract:      reference.ExternalName(),
+		Extract:      common.NetworkPortIDExtractor(),
 		Reference:    mg.Spec.ForProvider.PortIDRef,
 		Selector:     mg.Spec.ForProvider.PortIDSelector,
 		To: reference.To{
-			List:    &v1beta1.PortList{},
-			Managed: &v1beta1.Port{},
+			List:    &v1beta11.InstanceList{},
+			Managed: &v1beta11.Instance{},
 		},
 	})
 	if err != nil {
diff --git a/apis/vpcep/v1beta1/zz_generated_terraformed.go b/apis/vpcep/v1beta1/zz_generated_terraformed.go
index ba6284fa..addf6236 100755
--- a/apis/vpcep/v1beta1/zz_generated_terraformed.go
+++ b/apis/vpcep/v1beta1/zz_generated_terraformed.go
@@ -161,18 +161,18 @@ func (tr *Endpoint) GetTerraformSchemaVersion() int {
 	return 0
 }
 
-// GetTerraformResourceType returns Terraform resource type for this Service
-func (mg *Service) GetTerraformResourceType() string {
+// GetTerraformResourceType returns Terraform resource type for this VPCEPService
+func (mg *VPCEPService) GetTerraformResourceType() string {
 	return "flexibleengine_vpcep_service"
 }
 
-// GetConnectionDetailsMapping for this Service
-func (tr *Service) GetConnectionDetailsMapping() map[string]string {
+// GetConnectionDetailsMapping for this VPCEPService
+func (tr *VPCEPService) GetConnectionDetailsMapping() map[string]string {
 	return nil
 }
 
-// GetObservation of this Service
-func (tr *Service) GetObservation() (map[string]any, error) {
+// GetObservation of this VPCEPService
+func (tr *VPCEPService) GetObservation() (map[string]any, error) {
 	o, err := json.TFParser.Marshal(tr.Status.AtProvider)
 	if err != nil {
 		return nil, err
@@ -181,8 +181,8 @@ func (tr *Service) GetObservation() (map[string]any, error) {
 	return base, json.TFParser.Unmarshal(o, &base)
 }
 
-// SetObservation for this Service
-func (tr *Service) SetObservation(obs map[string]any) error {
+// SetObservation for this VPCEPService
+func (tr *VPCEPService) SetObservation(obs map[string]any) error {
 	p, err := json.TFParser.Marshal(obs)
 	if err != nil {
 		return err
@@ -190,16 +190,16 @@ func (tr *Service) SetObservation(obs map[string]any) error {
 	return json.TFParser.Unmarshal(p, &tr.Status.AtProvider)
 }
 
-// GetID returns ID of underlying Terraform resource of this Service
-func (tr *Service) GetID() string {
+// GetID returns ID of underlying Terraform resource of this VPCEPService
+func (tr *VPCEPService) GetID() string {
 	if tr.Status.AtProvider.ID == nil {
 		return ""
 	}
 	return *tr.Status.AtProvider.ID
 }
 
-// GetParameters of this Service
-func (tr *Service) GetParameters() (map[string]any, error) {
+// GetParameters of this VPCEPService
+func (tr *VPCEPService) GetParameters() (map[string]any, error) {
 	p, err := json.TFParser.Marshal(tr.Spec.ForProvider)
 	if err != nil {
 		return nil, err
@@ -208,8 +208,8 @@ func (tr *Service) GetParameters() (map[string]any, error) {
 	return base, json.TFParser.Unmarshal(p, &base)
 }
 
-// SetParameters for this Service
-func (tr *Service) SetParameters(params map[string]any) error {
+// SetParameters for this VPCEPService
+func (tr *VPCEPService) SetParameters(params map[string]any) error {
 	p, err := json.TFParser.Marshal(params)
 	if err != nil {
 		return err
@@ -217,10 +217,10 @@ func (tr *Service) SetParameters(params map[string]any) error {
 	return json.TFParser.Unmarshal(p, &tr.Spec.ForProvider)
 }
 
-// LateInitialize this Service using its observed tfState.
+// LateInitialize this VPCEPService using its observed tfState.
 // returns True if there are any spec changes for the resource.
-func (tr *Service) LateInitialize(attrs []byte) (bool, error) {
-	params := &ServiceParameters{}
+func (tr *VPCEPService) LateInitialize(attrs []byte) (bool, error) {
+	params := &VPCEPServiceParameters{}
 	if err := json.TFParser.Unmarshal(attrs, params); err != nil {
 		return false, errors.Wrap(err, "failed to unmarshal Terraform state parameters for late-initialization")
 	}
@@ -231,6 +231,6 @@ func (tr *Service) LateInitialize(attrs []byte) (bool, error) {
 }
 
 // GetTerraformSchemaVersion returns the associated Terraform schema version
-func (tr *Service) GetTerraformSchemaVersion() int {
+func (tr *VPCEPService) GetTerraformSchemaVersion() int {
 	return 0
 }
diff --git a/apis/vpcep/v1beta1/zz_service_types.go b/apis/vpcep/v1beta1/zz_vpcepservice_types.go
similarity index 78%
rename from apis/vpcep/v1beta1/zz_service_types.go
rename to apis/vpcep/v1beta1/zz_vpcepservice_types.go
index 1f07fef5..8dc4baef 100755
--- a/apis/vpcep/v1beta1/zz_service_types.go
+++ b/apis/vpcep/v1beta1/zz_vpcepservice_types.go
@@ -35,7 +35,7 @@ type PortMappingParameters struct {
 	TerminalPort *float64 `json:"terminalPort,omitempty" tf:"terminal_port,omitempty"`
 }
 
-type ServiceConnectionsObservation struct {
+type VPCEPServiceConnectionsObservation struct {
 
 	// The user's domain ID.
 	DomainID *string `json:"domainId,omitempty" tf:"domain_id,omitempty"`
@@ -50,13 +50,13 @@ type ServiceConnectionsObservation struct {
 	Status *string `json:"status,omitempty" tf:"status,omitempty"`
 }
 
-type ServiceConnectionsParameters struct {
+type VPCEPServiceConnectionsParameters struct {
 }
 
-type ServiceObservation struct {
+type VPCEPServiceObservation struct {
 
 	// An array of VPC endpoints connect to the VPC endpoint service. Structure is documented below.
-	Connections []ServiceConnectionsObservation `json:"connections,omitempty" tf:"connections,omitempty"`
+	Connections []VPCEPServiceConnectionsObservation `json:"connections,omitempty" tf:"connections,omitempty"`
 
 	// The unique ID of the VPC endpoint service.
 	ID *string `json:"id,omitempty" tf:"id,omitempty"`
@@ -68,7 +68,7 @@ type ServiceObservation struct {
 	Status *string `json:"status,omitempty" tf:"status,omitempty"`
 }
 
-type ServiceParameters struct {
+type VPCEPServiceParameters struct {
 
 	// Specifies whether connection approval is required. The default value is false.
 	// +kubebuilder:validation:Optional
@@ -85,15 +85,16 @@ type ServiceParameters struct {
 	Permissions []*string `json:"permissions,omitempty" tf:"permissions,omitempty"`
 
 	// Specifies the ID for identifying the backend resource of the VPC endpoint service.
-	// +crossplane:generate:reference:type=github.com/FrangipaneTeam/provider-flexibleengine/apis/vpc/v1beta1.Port
+	// +crossplane:generate:reference:type=github.com/FrangipaneTeam/provider-flexibleengine/apis/ecs/v1beta1.Instance
+	// +crossplane:generate:reference:extractor=github.com/FrangipaneTeam/provider-flexibleengine/config/common.NetworkPortIDExtractor()
 	// +kubebuilder:validation:Optional
 	PortID *string `json:"portId,omitempty" tf:"port_id,omitempty"`
 
-	// Reference to a Port in vpc to populate portId.
+	// Reference to a Instance in ecs to populate portId.
 	// +kubebuilder:validation:Optional
 	PortIDRef *v1.Reference `json:"portIdRef,omitempty" tf:"-"`
 
-	// Selector for a Port in vpc to populate portId.
+	// Selector for a Instance in ecs to populate portId.
 	// +kubebuilder:validation:Optional
 	PortIDSelector *v1.Selector `json:"portIdSelector,omitempty" tf:"-"`
 
@@ -134,51 +135,51 @@ type ServiceParameters struct {
 	VPCIDSelector *v1.Selector `json:"vpcIdSelector,omitempty" tf:"-"`
 }
 
-// ServiceSpec defines the desired state of Service
-type ServiceSpec struct {
+// VPCEPServiceSpec defines the desired state of VPCEPService
+type VPCEPServiceSpec struct {
 	v1.ResourceSpec `json:",inline"`
-	ForProvider     ServiceParameters `json:"forProvider"`
+	ForProvider     VPCEPServiceParameters `json:"forProvider"`
 }
 
-// ServiceStatus defines the observed state of Service.
-type ServiceStatus struct {
+// VPCEPServiceStatus defines the observed state of VPCEPService.
+type VPCEPServiceStatus struct {
 	v1.ResourceStatus `json:",inline"`
-	AtProvider        ServiceObservation `json:"atProvider,omitempty"`
+	AtProvider        VPCEPServiceObservation `json:"atProvider,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 
-// Service is the Schema for the Services API. ""page_title: "flexibleengine_vpcep_service"
+// VPCEPService is the Schema for the VPCEPServices API. ""page_title: "flexibleengine_vpcep_service"
 // +kubebuilder:printcolumn:name="READY",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
 // +kubebuilder:printcolumn:name="SYNCED",type="string",JSONPath=".status.conditions[?(@.type=='Synced')].status"
 // +kubebuilder:printcolumn:name="EXTERNAL-NAME",type="string",JSONPath=".metadata.annotations.crossplane\\.io/external-name"
 // +kubebuilder:printcolumn:name="AGE",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster,categories={crossplane,managed,flexibleengine}
-type Service struct {
+type VPCEPService struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
-	Spec              ServiceSpec   `json:"spec"`
-	Status            ServiceStatus `json:"status,omitempty"`
+	Spec              VPCEPServiceSpec   `json:"spec"`
+	Status            VPCEPServiceStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 
-// ServiceList contains a list of Services
-type ServiceList struct {
+// VPCEPServiceList contains a list of VPCEPServices
+type VPCEPServiceList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Service `json:"items"`
+	Items           []VPCEPService `json:"items"`
 }
 
 // Repository type metadata.
 var (
-	Service_Kind             = "Service"
-	Service_GroupKind        = schema.GroupKind{Group: CRDGroup, Kind: Service_Kind}.String()
-	Service_KindAPIVersion   = Service_Kind + "." + CRDGroupVersion.String()
-	Service_GroupVersionKind = CRDGroupVersion.WithKind(Service_Kind)
+	VPCEPService_Kind             = "VPCEPService"
+	VPCEPService_GroupKind        = schema.GroupKind{Group: CRDGroup, Kind: VPCEPService_Kind}.String()
+	VPCEPService_KindAPIVersion   = VPCEPService_Kind + "." + CRDGroupVersion.String()
+	VPCEPService_GroupVersionKind = CRDGroupVersion.WithKind(VPCEPService_Kind)
 )
 
 func init() {
-	SchemeBuilder.Register(&Service{}, &ServiceList{})
+	SchemeBuilder.Register(&VPCEPService{}, &VPCEPServiceList{})
 }
diff --git a/config/common/common.go b/config/common/common.go
index a652f41b..74fa4520 100644
--- a/config/common/common.go
+++ b/config/common/common.go
@@ -43,8 +43,29 @@ var (
 
 	// PathIDExtractor is the golang path to IDExtractor function
 	PathIDExtractor = SelfPackagePath + ".IDExtractor()"
+
+	// PathNetworkPortIDExtractor is the golang path to NetworkPortIDExtractor function
+	PathNetworkPortIDExtractor = SelfPackagePath + ".NetworkPortIDExtractor()"
 )
 
+// NetworkPortIDExtractor extracts network port ID from "status.atProvider.network.0.uuid"
+func NetworkPortIDExtractor() reference.ExtractValueFn {
+	return func(mg xpresource.Managed) string {
+		paved, err := fieldpath.PaveObject(mg)
+		if err != nil {
+			// TODO should we log this error?
+			return ""
+		}
+		fmt.Printf("paved: %v", paved)
+		r, err := paved.GetString("status.atProvider.network[0].port")
+		if err != nil {
+			// TODO should we log this error?
+			return ""
+		}
+		return r
+	}
+}
+
 // RegionExtractor extracts region from "spec.forProvider.region" which
 func RegionExtractor() reference.ExtractValueFn {
 	return func(mg xpresource.Managed) string {
diff --git a/config/ecs/config.go b/config/ecs/config.go
index 9fd20ed0..668e820a 100644
--- a/config/ecs/config.go
+++ b/config/ecs/config.go
@@ -28,6 +28,9 @@ func Configure(p *config.Provider) {
 		r.References["network.port"] = config.Reference{
 			Type: tools.GenerateType("vpc", "Port"),
 		}
+
+		config.MoveToStatus(r.TerraformResource, "network.port")
+
 		r.References["key_pair"] = config.Reference{
 			Type: "KeyPair",
 		}
diff --git a/config/groups.go b/config/groups.go
index 900b7948..49a046c4 100644
--- a/config/groups.go
+++ b/config/groups.go
@@ -195,4 +195,5 @@ var KindMap = map[string]string{
 	"flexibleengine_ces_alarmrule":                   "AlarmRule",
 	"flexibleengine_dli_package":                     "DLIPackage",
 	"flexibleengine_antiddos_v1":                     "AntiDDoS",
+	"flexibleengine_vpcep_service":                   "VPCEPService",
 }
diff --git a/config/vpcep/config.go b/config/vpcep/config.go
index 9ba86ed2..9b86c959 100644
--- a/config/vpcep/config.go
+++ b/config/vpcep/config.go
@@ -1,18 +1,31 @@
 // Package vpcep contains FlexibleEngine Virtual Private Cloud Endpoint (VPCEP) resources.
 package vpcep
 
-import "github.com/upbound/upjet/pkg/config"
+import (
+	"github.com/FrangipaneTeam/provider-flexibleengine/config/common"
+	"github.com/FrangipaneTeam/provider-flexibleengine/pkg/tools"
+	"github.com/upbound/upjet/pkg/config"
+)
 
 // Configure configures individual resources by adding custom ResourceConfigurators.
 func Configure(p *config.Provider) {
 
+	// flexibleengine_vpcep_service
+	// https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine/latest/docs/resources/vpcep_service
+	p.AddResourceConfigurator("flexibleengine_vpcep_service", func(r *config.Resource) {
+		r.References["port_id"] = config.Reference{
+			Type:      tools.GenerateType("ecs", "Instance"),
+			Extractor: common.PathNetworkPortIDExtractor,
+		}
+	})
+
 	// flexibleengine_vpcep_endpoint
 	// https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine/latest/docs/resources/vpcep_endpoint
 	p.AddResourceConfigurator("flexibleengine_vpcep_endpoint", func(r *config.Resource) {
 
 		// service_id is the ID of the service to which this endpoint will be attached.
 		r.References["service_id"] = config.Reference{
-			Type: "Service",
+			Type: "VPCEPService",
 		}
 
 	})
@@ -21,18 +34,16 @@ func Configure(p *config.Provider) {
 	// https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine/latest/docs/resources/vpcep_approval
 	p.AddResourceConfigurator("flexibleengine_vpcep_approval", func(r *config.Resource) {
 
-		// endpoint_id is the ID of the endpoint to which this approval will be attached.
+		// endpoints is the ID of the endpoint to which this approval will be attached.
 		r.References["endpoints"] = config.Reference{
 			Type: "Endpoint",
 		}
 
 		// service_id is the ID of the service to which this approval will be attached.
 		r.References["service_id"] = config.Reference{
-			Type: "Service",
+			Type: "VPCEPService",
 		}
 
-		r.UseAsync = true
-
 	})
 
 }
diff --git a/examples-generated/vpcep/approval.yaml b/examples-generated/vpcep/approval.yaml
index 74d76811..c7f55824 100644
--- a/examples-generated/vpcep/approval.yaml
+++ b/examples-generated/vpcep/approval.yaml
@@ -40,7 +40,7 @@ spec:
 ---
 
 apiVersion: vpcep.flexibleengine.upbound.io/v1beta1
-kind: Service
+kind: VPCEPService
 metadata:
   annotations:
     meta.upbound.io/example-id: vpcep/v1beta1/approval
diff --git a/examples-generated/vpcep/service.yaml b/examples-generated/vpcep/vpcepservice.yaml
similarity index 85%
rename from examples-generated/vpcep/service.yaml
rename to examples-generated/vpcep/vpcepservice.yaml
index e76c51f4..026607b2 100644
--- a/examples-generated/vpcep/service.yaml
+++ b/examples-generated/vpcep/vpcepservice.yaml
@@ -1,8 +1,8 @@
 apiVersion: vpcep.flexibleengine.upbound.io/v1beta1
-kind: Service
+kind: VPCEPService
 metadata:
   annotations:
-    meta.upbound.io/example-id: vpcep/v1beta1/service
+    meta.upbound.io/example-id: vpcep/v1beta1/vpcepservice
   labels:
     testing.upbound.io/example-name: demo
   name: demo
diff --git a/examples/vpcep/approval.yaml b/examples/vpcep/approval.yaml
new file mode 100644
index 00000000..7c78400a
--- /dev/null
+++ b/examples/vpcep/approval.yaml
@@ -0,0 +1,15 @@
+apiVersion: vpcep.flexibleengine.upbound.io/v1beta1
+kind: Approval
+metadata:
+  annotations:
+    meta.upbound.io/example-id: vpcep/v1beta1/approval
+  labels:
+    testing.upbound.io/example-name: example_vpcep_approval
+  name: example-vpcep-approval
+spec:
+  forProvider:
+    endpointsRefs:
+      - name: example-vpcep-endpoint
+    serviceIdSelector:
+      matchLabels:
+        testing.upbound.io/example-name: example_vpcep_service
diff --git a/examples/vpcep/endpoint.yaml b/examples/vpcep/endpoint.yaml
new file mode 100644
index 00000000..f9de3669
--- /dev/null
+++ b/examples/vpcep/endpoint.yaml
@@ -0,0 +1,21 @@
+apiVersion: vpcep.flexibleengine.upbound.io/v1beta1
+kind: Endpoint
+metadata:
+  annotations:
+    meta.upbound.io/example-id: vpcep/v1beta1/endpoint
+  labels:
+    testing.upbound.io/example-name: example_vpcep_endpoint
+  name: example-vpcep-endpoint
+spec:
+  forProvider:
+    enableDns: true
+    enableWhitelist: true
+    networkIdSelector:
+      matchLabels:
+        testing.upbound.io/example-name: example_subnet
+    serviceIdSelector:
+      matchLabels:
+        testing.upbound.io/example-name: example_vpcep_service
+    vpcIdSelector:
+      matchLabels:
+        testing.upbound.io/example-name: example_vpc
diff --git a/examples/vpcep/vpcepservice.yaml b/examples/vpcep/vpcepservice.yaml
new file mode 100644
index 00000000..6705350c
--- /dev/null
+++ b/examples/vpcep/vpcepservice.yaml
@@ -0,0 +1,21 @@
+apiVersion: vpcep.flexibleengine.upbound.io/v1beta1
+kind: VPCEPService
+metadata:
+  annotations:
+    meta.upbound.io/example-id: vpcep/v1beta1/service
+  labels:
+    testing.upbound.io/example-name: example_vpcep_service
+  name: example-vpcep-service
+spec:
+  forProvider:
+    name: example-service
+    portIdSelector:
+      matchLabels:
+        testing.upbound.io/example-name: example_instance
+    portMapping:
+      - servicePort: 8080
+        terminalPort: 80
+    serverType: VM
+    vpcIdSelector:
+      matchLabels:
+        testing.upbound.io/example-name: example_vpc
diff --git a/internal/controller/vpcep/service/zz_controller.go b/internal/controller/vpcep/vpcepservice/zz_controller.go
similarity index 84%
rename from internal/controller/vpcep/service/zz_controller.go
rename to internal/controller/vpcep/vpcepservice/zz_controller.go
index 312fa0ff..4321c45c 100755
--- a/internal/controller/vpcep/service/zz_controller.go
+++ b/internal/controller/vpcep/vpcepservice/zz_controller.go
@@ -4,7 +4,7 @@ Copyright 2022 Upbound Inc.
 
 // Code generated by upjet. DO NOT EDIT.
 
-package service
+package vpcepservice
 
 import (
 	"time"
@@ -21,18 +21,18 @@ import (
 	v1beta1 "github.com/FrangipaneTeam/provider-flexibleengine/apis/vpcep/v1beta1"
 )
 
-// Setup adds a controller that reconciles Service managed resources.
+// Setup adds a controller that reconciles VPCEPService managed resources.
 func Setup(mgr ctrl.Manager, o tjcontroller.Options) error {
-	name := managed.ControllerName(v1beta1.Service_GroupVersionKind.String())
+	name := managed.ControllerName(v1beta1.VPCEPService_GroupVersionKind.String())
 	var initializers managed.InitializerChain
 	cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())}
 	if o.SecretStoreConfigGVK != nil {
 		cps = append(cps, connection.NewDetailsManager(mgr.GetClient(), *o.SecretStoreConfigGVK))
 	}
 	r := managed.NewReconciler(mgr,
-		xpresource.ManagedKind(v1beta1.Service_GroupVersionKind),
+		xpresource.ManagedKind(v1beta1.VPCEPService_GroupVersionKind),
 		managed.WithExternalConnecter(tjcontroller.NewConnector(mgr.GetClient(), o.WorkspaceStore, o.SetupFn, o.Provider.Resources["flexibleengine_vpcep_service"],
-			tjcontroller.WithCallbackProvider(tjcontroller.NewAPICallbacks(mgr, xpresource.ManagedKind(v1beta1.Service_GroupVersionKind))),
+			tjcontroller.WithCallbackProvider(tjcontroller.NewAPICallbacks(mgr, xpresource.ManagedKind(v1beta1.VPCEPService_GroupVersionKind))),
 		)),
 		managed.WithLogger(o.Logger.WithValues("controller", name)),
 		managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name))),
@@ -46,6 +46,6 @@ func Setup(mgr ctrl.Manager, o tjcontroller.Options) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		Named(name).
 		WithOptions(o.ForControllerRuntime()).
-		For(&v1beta1.Service{}).
+		For(&v1beta1.VPCEPService{}).
 		Complete(ratelimiter.NewReconciler(name, r, o.GlobalRateLimiter))
 }
diff --git a/internal/controller/zz_setup.go b/internal/controller/zz_setup.go
index 024aa5d4..486d3b6f 100755
--- a/internal/controller/zz_setup.go
+++ b/internal/controller/zz_setup.go
@@ -167,7 +167,7 @@ import (
 	vpcsubnet "github.com/FrangipaneTeam/provider-flexibleengine/internal/controller/vpc/vpcsubnet"
 	approval "github.com/FrangipaneTeam/provider-flexibleengine/internal/controller/vpcep/approval"
 	endpoint "github.com/FrangipaneTeam/provider-flexibleengine/internal/controller/vpcep/endpoint"
-	service "github.com/FrangipaneTeam/provider-flexibleengine/internal/controller/vpcep/service"
+	vpcepservice "github.com/FrangipaneTeam/provider-flexibleengine/internal/controller/vpcep/vpcepservice"
 	certificatewaf "github.com/FrangipaneTeam/provider-flexibleengine/internal/controller/waf/certificate"
 	dedicatedcertificate "github.com/FrangipaneTeam/provider-flexibleengine/internal/controller/waf/dedicatedcertificate"
 	dedicateddomain "github.com/FrangipaneTeam/provider-flexibleengine/internal/controller/waf/dedicateddomain"
@@ -345,7 +345,7 @@ func Setup(mgr ctrl.Manager, o controller.Options) error {
 		vpcsubnet.Setup,
 		approval.Setup,
 		endpoint.Setup,
-		service.Setup,
+		vpcepservice.Setup,
 		certificatewaf.Setup,
 		dedicatedcertificate.Setup,
 		dedicateddomain.Setup,
diff --git a/list-tested.md b/list-tested.md
index a969a152..f5bc9a3d 100644
--- a/list-tested.md
+++ b/list-tested.md
@@ -1,376 +1,378 @@
 # Resources tested
+# Resources tested
 
 Last update: Mar  3 jan 2023 11:39:01 CET
 
-## cse
-|Kind|CRD|Tested|
-|---|---|---|
-|Microservice|Microservice.cse.flexibleengine.upbound.io/v1beta1|:x:|
-|MicroserviceEngine|MicroserviceEngine.cse.flexibleengine.upbound.io/v1beta1|:x:|
-|MicroserviceInstance|MicroserviceInstance.cse.flexibleengine.upbound.io/v1beta1|:x:|
-
-## eip
-|Kind|CRD|Tested|
-|---|---|---|
-|EIP|EIP.eip.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|EIPAssociate|EIPAssociate.eip.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+Last update: Mer  4 jan 2023 18:48:22 CET
 
-## mrsd
-|Kind|CRD|Tested|
-|---|---|---|
-|Cluster|Cluster.mrsd.flexibleengine.upbound.io/v1beta1|:x:|
-|Job|Job.mrsd.flexibleengine.upbound.io/v1beta1|:x:|
-|HybridCluster|HybridCluster.mrsd.flexibleengine.upbound.io/v1beta1|:x:|
-
-## nat
-|Kind|CRD|Tested|
-|---|---|---|
-|DnatRule|DnatRule.nat.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|SnatRule|SnatRule.nat.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Gateway|Gateway.nat.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## oss
+| Kind                 | CRD                                                        | Tested             |
+| -------------------- | ---------------------------------------------------------- | ------------------ |
+| S3BucketPolicy       | S3BucketPolicy.oss.flexibleengine.upbound.io/v1beta1       | :white_check_mark: |
+| S3BucketObject       | S3BucketObject.oss.flexibleengine.upbound.io/v1beta1       | :white_check_mark: |
+| OBSBucket            | OBSBucket.oss.flexibleengine.upbound.io/v1beta1            | :white_check_mark: |
+| OBSBucketObject      | OBSBucketObject.oss.flexibleengine.upbound.io/v1beta1      | :white_check_mark: |
+| S3Bucket             | S3Bucket.oss.flexibleengine.upbound.io/v1beta1             | :white_check_mark: |
+| OBSBucketReplication | OBSBucketReplication.oss.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
 
-## dms
-|Kind|CRD|Tested|
-|---|---|---|
-|KafkaInstance|KafkaInstance.dms.flexibleengine.upbound.io/v1beta1|:x:|
-|KafkaTopic|KafkaTopic.dms.flexibleengine.upbound.io/v1beta1|:x:|
-|KafkaUser|KafkaUser.dms.flexibleengine.upbound.io/v1beta1|:x:|
+## cce
+| Kind      | CRD                                             | Tested             |
+| --------- | ----------------------------------------------- | ------------------ |
+| NodePool  | NodePool.cce.flexibleengine.upbound.io/v1beta1  | :white_check_mark: |
+| Pvc       | Pvc.cce.flexibleengine.upbound.io/v1beta1       | :white_check_mark: |
+| Addon     | Addon.cce.flexibleengine.upbound.io/v1beta1     | :white_check_mark: |
+| Cluster   | Cluster.cce.flexibleengine.upbound.io/v1beta1   | :white_check_mark: |
+| Node      | Node.cce.flexibleengine.upbound.io/v1beta1      | :white_check_mark: |
+| Namespace | Namespace.cce.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
 
-## dli
-|Kind|CRD|Tested|
-|---|---|---|
-|Table|Table.dli.flexibleengine.upbound.io/v1beta1|:x:|
-|DLIPackage|DLIPackage.dli.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|SparkJob|SparkJob.dli.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|FlinksqlJob|FlinksqlJob.dli.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Queue|Queue.dli.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Database|Database.dli.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## vbs
+| Kind         | CRD                                                | Tested |
+| ------------ | -------------------------------------------------- | ------ |
+| BackupPolicy | BackupPolicy.vbs.flexibleengine.upbound.io/v1beta1 | :x:    |
+| Backup       | Backup.vbs.flexibleengine.upbound.io/v1beta1       | :x:    |
 
-## dns
-|Kind|CRD|Tested|
-|---|---|---|
-|Zone|Zone.dns.flexibleengine.upbound.io/v1beta1|:x:|
-|Recordset|Recordset.dns.flexibleengine.upbound.io/v1beta1|:x:|
+## flexibleengine
+| Kind                | CRD                                                   | Tested             |
+| ------------------- | ----------------------------------------------------- | ------------------ |
+| StoreConfig         | StoreConfig.flexibleengine.upbound.io/v1alpha1        | :x:                |
+| ProviderConfig      | ProviderConfig.flexibleengine.upbound.io/v1beta1      | :white_check_mark: |
+| ProviderConfigUsage | ProviderConfigUsage.flexibleengine.upbound.io/v1beta1 | :x:                |
 
-## swr
-|Kind|CRD|Tested|
-|---|---|---|
-|Organization|Organization.swr.flexibleengine.upbound.io/v1beta1|:x:|
-|OrganizationUsers|OrganizationUsers.swr.flexibleengine.upbound.io/v1beta1|:x:|
-|Repository|Repository.swr.flexibleengine.upbound.io/v1beta1|:x:|
-|RepositorySharing|RepositorySharing.swr.flexibleengine.upbound.io/v1beta1|:x:|
+## elb
+| Kind         | CRD                                                | Tested             |
+| ------------ | -------------------------------------------------- | ------------------ |
+| Whitelist    | Whitelist.elb.flexibleengine.upbound.io/v1beta1    | :white_check_mark: |
+| Monitor      | Monitor.elb.flexibleengine.upbound.io/v1beta1      | :white_check_mark: |
+| Pool         | Pool.elb.flexibleengine.upbound.io/v1beta1         | :white_check_mark: |
+| Listener     | Listener.elb.flexibleengine.upbound.io/v1beta1     | :white_check_mark: |
+| Member       | Member.elb.flexibleengine.upbound.io/v1beta1       | :white_check_mark: |
+| L7Policy     | L7Policy.elb.flexibleengine.upbound.io/v1beta1     | :white_check_mark: |
+| L7Rule       | L7Rule.elb.flexibleengine.upbound.io/v1beta1       | :white_check_mark: |
+| LoadBalancer | LoadBalancer.elb.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
 
-## oss
-|Kind|CRD|Tested|
-|---|---|---|
-|OBSBucket|OBSBucket.oss.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|S3BucketObject|S3BucketObject.oss.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|OBSBucketReplication|OBSBucketReplication.oss.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|S3BucketPolicy|S3BucketPolicy.oss.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|S3Bucket|S3Bucket.oss.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|OBSBucketObject|OBSBucketObject.oss.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## cse
+| Kind                 | CRD                                                        | Tested |
+| -------------------- | ---------------------------------------------------------- | ------ |
+| MicroserviceEngine   | MicroserviceEngine.cse.flexibleengine.upbound.io/v1beta1   | :x:    |
+| MicroserviceInstance | MicroserviceInstance.cse.flexibleengine.upbound.io/v1beta1 | :x:    |
+| Microservice         | Microservice.cse.flexibleengine.upbound.io/v1beta1         | :x:    |
 
-## rds
-|Kind|CRD|Tested|
-|---|---|---|
-|ParameterGroup|ParameterGroup.rds.flexibleengine.upbound.io/v1beta1|:x:|
-|DatabasePrivilege|DatabasePrivilege.rds.flexibleengine.upbound.io/v1beta1|:x:|
-|Instance|Instance.rds.flexibleengine.upbound.io/v1beta1|:x:|
-|Account|Account.rds.flexibleengine.upbound.io/v1beta1|:x:|
-|Database|Database.rds.flexibleengine.upbound.io/v1beta1|:x:|
-|ReadReplica|ReadReplica.rds.flexibleengine.upbound.io/v1beta1|:x:|
+## vbs
+| Kind         | CRD                                                         | Tested             |
+| ------------ | ----------------------------------------------------------- | ------------------ |
+| LoadBalancer | LoadBalancer.dedicatedelb.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| Pool         | Pool.dedicatedelb.flexibleengine.upbound.io/v1beta1         | :white_check_mark: |
+| Listener     | Listener.dedicatedelb.flexibleengine.upbound.io/v1beta1     | :white_check_mark: |
+| Member       | Member.dedicatedelb.flexibleengine.upbound.io/v1beta1       | :white_check_mark: |
+| Monitor      | Monitor.dedicatedelb.flexibleengine.upbound.io/v1beta1      | :white_check_mark: |
+| Certificate  | Certificate.dedicatedelb.flexibleengine.upbound.io/v1beta1  | :white_check_mark: |
+| IPGroup      | IPGroup.dedicatedelb.flexibleengine.upbound.io/v1beta1      | :white_check_mark: |
 
-## csbs
-|Kind|CRD|Tested|
-|---|---|---|
-|BackupPolicy|BackupPolicy.csbs.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Backup|Backup.csbs.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## waf
+| Kind                    | CRD                                                           | Tested             |
+| ----------------------- | ------------------------------------------------------------- | ------------------ |
+| DedicatedInstance       | DedicatedInstance.waf.flexibleengine.upbound.io/v1beta1       | :white_check_mark: |
+| Domain                  | Domain.waf.flexibleengine.upbound.io/v1beta1                  | :white_check_mark: |
+| Certificate             | Certificate.waf.flexibleengine.upbound.io/v1beta1             | :white_check_mark: |
+| Policy                  | Policy.waf.flexibleengine.upbound.io/v1beta1                  | :white_check_mark: |
+| RuleBlacklist           | RuleBlacklist.waf.flexibleengine.upbound.io/v1beta1           | :white_check_mark: |
+| RuleAlarmMasking        | RuleAlarmMasking.waf.flexibleengine.upbound.io/v1beta1        | :white_check_mark: |
+| DedicatedPolicy         | DedicatedPolicy.waf.flexibleengine.upbound.io/v1beta1         | :white_check_mark: |
+| RuleDataMasking         | RuleDataMasking.waf.flexibleengine.upbound.io/v1beta1         | :white_check_mark: |
+| RuleWebTamperProtection | RuleWebTamperProtection.waf.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| DedicatedCertificate    | DedicatedCertificate.waf.flexibleengine.upbound.io/v1beta1    | :white_check_mark: |
+| RulePreciseProtection   | RulePreciseProtection.waf.flexibleengine.upbound.io/v1beta1   | :white_check_mark: |
+| DedicatedDomain         | DedicatedDomain.waf.flexibleengine.upbound.io/v1beta1         | :white_check_mark: |
+| RuleCcProtection        | RuleCcProtection.waf.flexibleengine.upbound.io/v1beta1        | :white_check_mark: |
 
-## vpc
-|Kind|CRD|Tested|
-|---|---|---|
-|VIPAssociate|VIPAssociate.vpc.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|SecurityGroupRule|SecurityGroupRule.vpc.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|VPC|VPC.vpc.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|RouteTable|RouteTable.vpc.flexibleengine.upbound.io/v1beta1|:x:|
-|FlowLog|FlowLog.vpc.flexibleengine.upbound.io/v1beta1|:x:|
-|VIP|VIP.vpc.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|SecurityGroup|SecurityGroup.vpc.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Route|Route.vpc.flexibleengine.upbound.io/v1beta1|:x:|
-|PeeringConnectionAccepter|PeeringConnectionAccepter.vpc.flexibleengine.upbound.io/v1beta1|:x:|
-|Port|Port.vpc.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|VPCSubnet|VPCSubnet.vpc.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|PeeringConnection|PeeringConnection.vpc.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## lts
+| Kind          | CRD                                                | Tested             |
+| ------------- | -------------------------------------------------- | ------------------ |
+| LifecycleHook | LifecycleHook.as.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| Configuration | Configuration.as.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| Policy        | Policy.as.flexibleengine.upbound.io/v1beta1        | :white_check_mark: |
+| Group         | Group.as.flexibleengine.upbound.io/v1beta1         | :white_check_mark: |
 
-## waf
-|Kind|CRD|Tested|
-|---|---|---|
-|RuleDataMasking|RuleDataMasking.waf.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|RuleWebTamperProtection|RuleWebTamperProtection.waf.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|DedicatedPolicy|DedicatedPolicy.waf.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Certificate|Certificate.waf.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|DedicatedDomain|DedicatedDomain.waf.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|RuleCcProtection|RuleCcProtection.waf.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|RulePreciseProtection|RulePreciseProtection.waf.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Domain|Domain.waf.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|DedicatedInstance|DedicatedInstance.waf.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|DedicatedCertificate|DedicatedCertificate.waf.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|RuleAlarmMasking|RuleAlarmMasking.waf.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Policy|Policy.waf.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|RuleBlacklist|RuleBlacklist.waf.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## ecs
+| Kind                | CRD                                                       | Tested             |
+| ------------------- | --------------------------------------------------------- | ------------------ |
+| KeyPair             | KeyPair.ecs.flexibleengine.upbound.io/v1beta1             | :white_check_mark: |
+| VolumeAttach        | VolumeAttach.ecs.flexibleengine.upbound.io/v1beta1        | :x:                |
+| Instance            | Instance.ecs.flexibleengine.upbound.io/v1beta1            | :white_check_mark: |
+| InterfaceAttach     | InterfaceAttach.ecs.flexibleengine.upbound.io/v1beta1     | :x:                |
+| ServerGroup         | ServerGroup.ecs.flexibleengine.upbound.io/v1beta1         | :white_check_mark: |
+| FloatingIpAssociate | FloatingIpAssociate.ecs.flexibleengine.upbound.io/v1beta1 | :x:                |
 
-## antiddos
-|Kind|CRD|Tested|
-|---|---|---|
-|AntiDDoS|AntiDDoS.antiddos.flexibleengine.upbound.io/v1beta1|:x:|
+## dedicatedelb
+| Kind          | CRD                                                    | Tested |
+| ------------- | ------------------------------------------------------ | ------ |
+| ACL           | ACL.netacl.flexibleengine.upbound.io/v1beta1           | :x:    |
+| Rule          | Rule.netacl.flexibleengine.upbound.io/v1beta1          | :x:    |
+| ACLRule       | ACLRule.netacl.flexibleengine.upbound.io/v1beta1       | :x:    |
+| Policy        | Policy.netacl.flexibleengine.upbound.io/v1beta1        | :x:    |
+| FirewallGroup | FirewallGroup.netacl.flexibleengine.upbound.io/v1beta1 | :x:    |
 
-## mrs
-|Kind|CRD|Tested|
-|---|---|---|
-|Cluster|Cluster.mrs.flexibleengine.upbound.io/v1beta1|:x:|
-|Job|Job.mrs.flexibleengine.upbound.io/v1beta1|:x:|
+## drs
+| Kind | CRD                                       | Tested |
+| ---- | ----------------------------------------- | ------ |
+| Job  | Job.drs.flexibleengine.upbound.io/v1beta1 | :x:    |
 
-## vbs
-|Kind|CRD|Tested|
-|---|---|---|
-|BackupPolicy|BackupPolicy.vbs.flexibleengine.upbound.io/v1beta1|:x:|
-|Backup|Backup.vbs.flexibleengine.upbound.io/v1beta1|:x:|
+## dms
+| Kind          | CRD                                                 | Tested |
+| ------------- | --------------------------------------------------- | ------ |
+| KafkaUser     | KafkaUser.dms.flexibleengine.upbound.io/v1beta1     | :x:    |
+| KafkaInstance | KafkaInstance.dms.flexibleengine.upbound.io/v1beta1 | :x:    |
+| KafkaTopic    | KafkaTopic.dms.flexibleengine.upbound.io/v1beta1    | :x:    |
 
-## elb
-|Kind|CRD|Tested|
-|---|---|---|
-|Listener|Listener.elb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Whitelist|Whitelist.elb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|LoadBalancer|LoadBalancer.elb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|L7Rule|L7Rule.elb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|L7Policy|L7Policy.elb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Pool|Pool.elb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Monitor|Monitor.elb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Member|Member.elb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## smn
+| Kind         | CRD                                                | Tested             |
+| ------------ | -------------------------------------------------- | ------------------ |
+| Subscription | Subscription.smn.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| Topic        | Topic.smn.flexibleengine.upbound.io/v1beta1        | :white_check_mark: |
 
-## dds
-|Kind|CRD|Tested|
-|---|---|---|
-|DatabaseUser|DatabaseUser.dds.flexibleengine.upbound.io/v1beta1|:x:|
-|Instance|Instance.dds.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|DatabaseRole|DatabaseRole.dds.flexibleengine.upbound.io/v1beta1|:x:|
+## swr
+| Kind              | CRD                                                     | Tested |
+| ----------------- | ------------------------------------------------------- | ------ |
+| RepositorySharing | RepositorySharing.swr.flexibleengine.upbound.io/v1beta1 | :x:    |
+| OrganizationUsers | OrganizationUsers.swr.flexibleengine.upbound.io/v1beta1 | :x:    |
+| Organization      | Organization.swr.flexibleengine.upbound.io/v1beta1      | :x:    |
+| Repository        | Repository.swr.flexibleengine.upbound.io/v1beta1        | :x:    |
 
-## lts
-|Kind|CRD|Tested|
-|---|---|---|
-|Topic|Topic.lts.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Group|Group.lts.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## cbr
+| Kind   | CRD                                          | Tested             |
+| ------ | -------------------------------------------- | ------------------ |
+| Vault  | Vault.cbr.flexibleengine.upbound.io/v1beta1  | :white_check_mark: |
+| Policy | Policy.cbr.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
 
-## sdrs
-|Kind|CRD|Tested|
-|---|---|---|
-|ReplicationPair|ReplicationPair.sdrs.flexibleengine.upbound.io/v1beta1|:x:|
-|Drill|Drill.sdrs.flexibleengine.upbound.io/v1beta1|:x:|
-|ReplicationAttach|ReplicationAttach.sdrs.flexibleengine.upbound.io/v1beta1|:x:|
-|ProtectionGroup|ProtectionGroup.sdrs.flexibleengine.upbound.io/v1beta1|:x:|
-|ProtectedInstance|ProtectedInstance.sdrs.flexibleengine.upbound.io/v1beta1|:x:|
+## agd
+| Kind                      | CRD                                                             | Tested             |
+| ------------------------- | --------------------------------------------------------------- | ------------------ |
+| API                       | API.agd.flexibleengine.upbound.io/v1beta1                       | :white_check_mark: |
+| ThrottlingPolicy          | ThrottlingPolicy.agd.flexibleengine.upbound.io/v1beta1          | :white_check_mark: |
+| APIPublishment            | APIPublishment.agd.flexibleengine.upbound.io/v1beta1            | :white_check_mark: |
+| Instance                  | Instance.agd.flexibleengine.upbound.io/v1beta1                  | :white_check_mark: |
+| CustomAuthorizer          | CustomAuthorizer.agd.flexibleengine.upbound.io/v1beta1          | :white_check_mark: |
+| VPCChannel                | VPCChannel.agd.flexibleengine.upbound.io/v1beta1                | :white_check_mark: |
+| Group                     | Group.agd.flexibleengine.upbound.io/v1beta1                     | :white_check_mark: |
+| Application               | Application.agd.flexibleengine.upbound.io/v1beta1               | :white_check_mark: |
+| Response                  | Response.agd.flexibleengine.upbound.io/v1beta1                  | :white_check_mark: |
+| Environment               | Environment.agd.flexibleengine.upbound.io/v1beta1               | :white_check_mark: |
+| ThrottlingPolicyAssociate | ThrottlingPolicyAssociate.agd.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
 
-## vpcep
-|Kind|CRD|Tested|
-|---|---|---|
-|Endpoint|Endpoint.vpcep.flexibleengine.upbound.io/v1beta1|:x:|
-|Service|Service.vpcep.flexibleengine.upbound.io/v1beta1|:x:|
-|Approval|Approval.vpcep.flexibleengine.upbound.io/v1beta1|:x:|
+## iam
+| Kind               | CRD                                                      | Tested             |
+| ------------------ | -------------------------------------------------------- | ------------------ |
+| ProviderConversion | ProviderConversion.iam.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| Agency             | Agency.iam.flexibleengine.upbound.io/v1beta1             | :white_check_mark: |
+| Role               | Role.iam.flexibleengine.upbound.io/v1beta1               | :white_check_mark: |
+| Group              | Group.iam.flexibleengine.upbound.io/v1beta1              | :white_check_mark: |
+| Project            | Project.iam.flexibleengine.upbound.io/v1beta1            | :white_check_mark: |
+| User               | User.iam.flexibleengine.upbound.io/v1beta1               | :white_check_mark: |
+| Provider           | Provider.iam.flexibleengine.upbound.io/v1beta1           | :white_check_mark: |
+| RoleAssignment     | RoleAssignment.iam.flexibleengine.upbound.io/v1beta1     | :white_check_mark: |
+| GroupMembership    | GroupMembership.iam.flexibleengine.upbound.io/v1beta1    | :white_check_mark: |
 
-## dedicatedelb
-|Kind|CRD|Tested|
-|---|---|---|
-|Monitor|Monitor.dedicatedelb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|IPGroup|IPGroup.dedicatedelb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Pool|Pool.dedicatedelb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Listener|Listener.dedicatedelb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Member|Member.dedicatedelb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|LoadBalancer|LoadBalancer.dedicatedelb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Certificate|Certificate.dedicatedelb.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## mrsd
+| Kind          | CRD                                                  | Tested |
+| ------------- | ---------------------------------------------------- | ------ |
+| Cluster       | Cluster.mrsd.flexibleengine.upbound.io/v1beta1       | :x:    |
+| Job           | Job.mrsd.flexibleengine.upbound.io/v1beta1           | :x:    |
+| HybridCluster | HybridCluster.mrsd.flexibleengine.upbound.io/v1beta1 | :x:    |
 
-## tms
-|Kind|CRD|Tested|
-|---|---|---|
-|Tags|Tags.tms.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## csbs
+| Kind         | CRD                                                 | Tested             |
+| ------------ | --------------------------------------------------- | ------------------ |
+| BackupPolicy | BackupPolicy.csbs.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| Backup       | Backup.csbs.flexibleengine.upbound.io/v1beta1       | :white_check_mark: |
 
-## cts
-|Kind|CRD|Tested|
-|---|---|---|
-|Tracker|Tracker.cts.flexibleengine.upbound.io/v1beta1|:x:|
+## vpc
+| Kind                      | CRD                                                             | Tested             |
+| ------------------------- | --------------------------------------------------------------- | ------------------ |
+| PeeringConnectionAccepter | PeeringConnectionAccepter.vpc.flexibleengine.upbound.io/v1beta1 | :x:                |
+| SecurityGroup             | SecurityGroup.vpc.flexibleengine.upbound.io/v1beta1             | :white_check_mark: |
+| VIP                       | VIP.vpc.flexibleengine.upbound.io/v1beta1                       | :white_check_mark: |
+| VPCSubnet                 | VPCSubnet.vpc.flexibleengine.upbound.io/v1beta1                 | :white_check_mark: |
+| VPC                       | VPC.vpc.flexibleengine.upbound.io/v1beta1                       | :white_check_mark: |
+| SecurityGroupRule         | SecurityGroupRule.vpc.flexibleengine.upbound.io/v1beta1         | :white_check_mark: |
+| Route                     | Route.vpc.flexibleengine.upbound.io/v1beta1                     | :x:                |
+| PeeringConnection         | PeeringConnection.vpc.flexibleengine.upbound.io/v1beta1         | :white_check_mark: |
+| RouteTable                | RouteTable.vpc.flexibleengine.upbound.io/v1beta1                | :x:                |
+| FlowLog                   | FlowLog.vpc.flexibleengine.upbound.io/v1beta1                   | :x:                |
+| VIPAssociate              | VIPAssociate.vpc.flexibleengine.upbound.io/v1beta1              | :white_check_mark: |
+| Port                      | Port.vpc.flexibleengine.upbound.io/v1beta1                      | :white_check_mark: |
 
-## ecs
-|Kind|CRD|Tested|
-|---|---|---|
-|VolumeAttach|VolumeAttach.ecs.flexibleengine.upbound.io/v1beta1|:x:|
-|KeyPair|KeyPair.ecs.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|InterfaceAttach|InterfaceAttach.ecs.flexibleengine.upbound.io/v1beta1|:x:|
-|ServerGroup|ServerGroup.ecs.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|FloatingIpAssociate|FloatingIpAssociate.ecs.flexibleengine.upbound.io/v1beta1|:x:|
-|Instance|Instance.ecs.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## dli
+| Kind        | CRD                                               | Tested             |
+| ----------- | ------------------------------------------------- | ------------------ |
+| SparkJob    | SparkJob.dli.flexibleengine.upbound.io/v1beta1    | :white_check_mark: |
+| FlinksqlJob | FlinksqlJob.dli.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| Table       | Table.dli.flexibleengine.upbound.io/v1beta1       | :x:                |
+| DLIPackage  | DLIPackage.dli.flexibleengine.upbound.io/v1beta1  | :white_check_mark: |
+| Database    | Database.dli.flexibleengine.upbound.io/v1beta1    | :white_check_mark: |
+| Queue       | Queue.dli.flexibleengine.upbound.io/v1beta1       | :white_check_mark: |
 
-## agd
-|Kind|CRD|Tested|
-|---|---|---|
-|Application|Application.agd.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|ThrottlingPolicyAssociate|ThrottlingPolicyAssociate.agd.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|ThrottlingPolicy|ThrottlingPolicy.agd.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Response|Response.agd.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Group|Group.agd.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Instance|Instance.agd.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|APIPublishment|APIPublishment.agd.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Environment|Environment.agd.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|API|API.agd.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|VPCChannel|VPCChannel.agd.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|CustomAuthorizer|CustomAuthorizer.agd.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## vpcep
+| Kind         | CRD                                                  | Tested             |
+| ------------ | ---------------------------------------------------- | ------------------ |
+| VPCEPService | VPCEPService.vpcep.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| Approval     | Approval.vpcep.flexibleengine.upbound.io/v1beta1     | :white_check_mark: |
+| Endpoint     | Endpoint.vpcep.flexibleengine.upbound.io/v1beta1     | :white_check_mark: |
 
-## iam
-|Kind|CRD|Tested|
-|---|---|---|
-|Role|Role.iam.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|GroupMembership|GroupMembership.iam.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Project|Project.iam.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Agency|Agency.iam.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Group|Group.iam.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Provider|Provider.iam.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|ProviderConversion|ProviderConversion.iam.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|RoleAssignment|RoleAssignment.iam.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|User|User.iam.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-
-## netacl
-|Kind|CRD|Tested|
-|---|---|---|
-|ACLRule|ACLRule.netacl.flexibleengine.upbound.io/v1beta1|:x:|
-|Rule|Rule.netacl.flexibleengine.upbound.io/v1beta1|:x:|
-|ACL|ACL.netacl.flexibleengine.upbound.io/v1beta1|:x:|
-|Policy|Policy.netacl.flexibleengine.upbound.io/v1beta1|:x:|
-|FirewallGroup|FirewallGroup.netacl.flexibleengine.upbound.io/v1beta1|:x:|
+## kms
+| Kind | CRD                                       | Tested             |
+| ---- | ----------------------------------------- | ------------------ |
+| Key  | Key.kms.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
 
-## fgs
-|Kind|CRD|Tested|
-|---|---|---|
-|Trigger|Trigger.fgs.flexibleengine.upbound.io/v1beta1|:x:|
-|Function|Function.fgs.flexibleengine.upbound.io/v1beta1|:x:|
-|Dependency|Dependency.fgs.flexibleengine.upbound.io/v1beta1|:x:|
+## dws
+| Kind    | CRD                                           | Tested |
+| ------- | --------------------------------------------- | ------ |
+| Cluster | Cluster.dws.flexibleengine.upbound.io/v1beta1 | :x:    |
 
-## flexibleengine
-|Kind|CRD|Tested|
-|---|---|---|
-|ProviderConfigUsage|ProviderConfigUsage.flexibleengine.upbound.io/v1beta1|:x:|
-|ProviderConfig|ProviderConfig.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|StoreConfig|StoreConfig.flexibleengine.upbound.io/v1alpha1|:x:|
+## sdrs
+| Kind              | CRD                                                      | Tested |
+| ----------------- | -------------------------------------------------------- | ------ |
+| ProtectionGroup   | ProtectionGroup.sdrs.flexibleengine.upbound.io/v1beta1   | :x:    |
+| Drill             | Drill.sdrs.flexibleengine.upbound.io/v1beta1             | :x:    |
+| ProtectedInstance | ProtectedInstance.sdrs.flexibleengine.upbound.io/v1beta1 | :x:    |
+| ReplicationAttach | ReplicationAttach.sdrs.flexibleengine.upbound.io/v1beta1 | :x:    |
+| ReplicationPair   | ReplicationPair.sdrs.flexibleengine.upbound.io/v1beta1   | :x:    |
 
-## mls
-|Kind|CRD|Tested|
-|---|---|---|
-|Instance|Instance.mls.flexibleengine.upbound.io/v1beta1|:x:|
+## mrs
+| Kind    | CRD                                           | Tested |
+| ------- | --------------------------------------------- | ------ |
+| Cluster | Cluster.mrs.flexibleengine.upbound.io/v1beta1 | :x:    |
+| Job     | Job.mrs.flexibleengine.upbound.io/v1beta1     | :x:    |
 
-## cbr
-|Kind|CRD|Tested|
-|---|---|---|
-|Policy|Policy.cbr.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Vault|Vault.cbr.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## modelarts
+| Kind  | CRD                                        | Tested             |
+| ----- | ------------------------------------------ | ------------------ |
+| Group | Group.ag.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| API   | API.ag.flexibleengine.upbound.io/v1beta1   | :white_check_mark: |
 
 ## modelarts
-|Kind|CRD|Tested|
-|---|---|---|
-|DatasetVersion|DatasetVersion.modelarts.flexibleengine.upbound.io/v1beta1|:x:|
-|Dataset|Dataset.modelarts.flexibleengine.upbound.io/v1beta1|:x:|
+| Kind           | CRD                                                        | Tested |
+| -------------- | ---------------------------------------------------------- | ------ |
+| DatasetVersion | DatasetVersion.modelarts.flexibleengine.upbound.io/v1beta1 | :x:    |
+| Dataset        | Dataset.modelarts.flexibleengine.upbound.io/v1beta1        | :x:    |
 
-## drs
-|Kind|CRD|Tested|
-|---|---|---|
-|Job|Job.drs.flexibleengine.upbound.io/v1beta1|:x:|
+## rds
+| Kind              | CRD                                                     | Tested |
+| ----------------- | ------------------------------------------------------- | ------ |
+| Database          | Database.rds.flexibleengine.upbound.io/v1beta1          | :x:    |
+| Instance          | Instance.rds.flexibleengine.upbound.io/v1beta1          | :x:    |
+| ParameterGroup    | ParameterGroup.rds.flexibleengine.upbound.io/v1beta1    | :x:    |
+| Account           | Account.rds.flexibleengine.upbound.io/v1beta1           | :x:    |
+| DatabasePrivilege | DatabasePrivilege.rds.flexibleengine.upbound.io/v1beta1 | :x:    |
+| ReadReplica       | ReadReplica.rds.flexibleengine.upbound.io/v1beta1       | :x:    |
 
-## eps
-|Kind|CRD|Tested|
-|---|---|---|
-|Project|Project.eps.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## lts
+| Kind  | CRD                                         | Tested             |
+| ----- | ------------------------------------------- | ------------------ |
+| Group | Group.lts.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| Topic | Topic.lts.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
 
 ## rts
-|Kind|CRD|Tested|
-|---|---|---|
-|SoftwareConfig|SoftwareConfig.rts.flexibleengine.upbound.io/v1beta1|:x:|
-|Stack|Stack.rts.flexibleengine.upbound.io/v1beta1|:x:|
-
-## evs
-|Kind|CRD|Tested|
-|---|---|---|
-|BlockStorageVolume|BlockStorageVolume.evs.flexibleengine.upbound.io/v1beta1|:x:|
+| Kind           | CRD                                                  | Tested |
+| -------------- | ---------------------------------------------------- | ------ |
+| Stack          | Stack.rts.flexibleengine.upbound.io/v1beta1          | :x:    |
+| SoftwareConfig | SoftwareConfig.rts.flexibleengine.upbound.io/v1beta1 | :x:    |
 
 ## sfs
-|Kind|CRD|Tested|
-|---|---|---|
-|FileSystem|FileSystem.sfs.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|AccessRule|AccessRule.sfs.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Turbo|Turbo.sfs.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+| Kind       | CRD                                              | Tested             |
+| ---------- | ------------------------------------------------ | ------------------ |
+| FileSystem | FileSystem.sfs.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| AccessRule | AccessRule.sfs.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| Turbo      | Turbo.sfs.flexibleengine.upbound.io/v1beta1      | :white_check_mark: |
+
+## css
+| Kind     | CRD                                            | Tested |
+| -------- | ---------------------------------------------- | ------ |
+| Snapshot | Snapshot.css.flexibleengine.upbound.io/v1beta1 | :x:    |
+| Cluster  | Cluster.css.flexibleengine.upbound.io/v1beta1  | :x:    |
+
+## dns
+| Kind      | CRD                                             | Tested |
+| --------- | ----------------------------------------------- | ------ |
+| Recordset | Recordset.dns.flexibleengine.upbound.io/v1beta1 | :x:    |
+| Zone      | Zone.dns.flexibleengine.upbound.io/v1beta1      | :x:    |
 
 ## bms
-|Kind|CRD|Tested|
-|---|---|---|
-|Server|Server.bms.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-
-## as
-|Kind|CRD|Tested|
-|---|---|---|
-|Policy|Policy.as.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Configuration|Configuration.as.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Group|Group.as.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|LifecycleHook|LifecycleHook.as.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+| Kind   | CRD                                          | Tested             |
+| ------ | -------------------------------------------- | ------------------ |
+| Server | Server.bms.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+
+## evs
+| Kind               | CRD                                                      | Tested |
+| ------------------ | -------------------------------------------------------- | ------ |
+| BlockStorageVolume | BlockStorageVolume.evs.flexibleengine.upbound.io/v1beta1 | :x:    |
 
 ## ag
-|Kind|CRD|Tested|
-|---|---|---|
-|API|API.ag.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Group|Group.ag.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+| Kind  | CRD                                        | Tested             |
+| ----- | ------------------------------------------ | ------------------ |
+| API   | API.ag.flexibleengine.upbound.io/v1beta1   | :white_check_mark: |
+| Group | Group.ag.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
 
-## dws
-|Kind|CRD|Tested|
-|---|---|---|
-|Cluster|Cluster.dws.flexibleengine.upbound.io/v1beta1|:x:|
+## fgs
+| Kind       | CRD                                              | Tested |
+| ---------- | ------------------------------------------------ | ------ |
+| Trigger    | Trigger.fgs.flexibleengine.upbound.io/v1beta1    | :x:    |
+| Function   | Function.fgs.flexibleengine.upbound.io/v1beta1   | :x:    |
+| Dependency | Dependency.fgs.flexibleengine.upbound.io/v1beta1 | :x:    |
 
 ## ces
-|Kind|CRD|Tested|
-|---|---|---|
-|AlarmRule|AlarmRule.ces.flexibleengine.upbound.io/v1beta1|:x:|
+| Kind      | CRD                                             | Tested |
+| --------- | ----------------------------------------------- | ------ |
+| AlarmRule | AlarmRule.ces.flexibleengine.upbound.io/v1beta1 | :x:    |
 
-## cce
-|Kind|CRD|Tested|
-|---|---|---|
-|Addon|Addon.cce.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Namespace|Namespace.cce.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Node|Node.cce.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Cluster|Cluster.cce.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|NodePool|NodePool.cce.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Pvc|Pvc.cce.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## dds
+| Kind         | CRD                                                | Tested             |
+| ------------ | -------------------------------------------------- | ------------------ |
+| Instance     | Instance.dds.flexibleengine.upbound.io/v1beta1     | :white_check_mark: |
+| DatabaseUser | DatabaseUser.dds.flexibleengine.upbound.io/v1beta1 | :x:                |
+| DatabaseRole | DatabaseRole.dds.flexibleengine.upbound.io/v1beta1 | :x:                |
 
 ## dcs
-|Kind|CRD|Tested|
-|---|---|---|
-|Instance|Instance.dcs.flexibleengine.upbound.io/v1beta1|:x:|
+| Kind     | CRD                                            | Tested |
+| -------- | ---------------------------------------------- | ------ |
+| Instance | Instance.dcs.flexibleengine.upbound.io/v1beta1 | :x:    |
 
-## css
-|Kind|CRD|Tested|
-|---|---|---|
-|Cluster|Cluster.css.flexibleengine.upbound.io/v1beta1|:x:|
-|Snapshot|Snapshot.css.flexibleengine.upbound.io/v1beta1|:x:|
+## dis
+| Kind   | CRD                                          | Tested             |
+| ------ | -------------------------------------------- | ------------------ |
+| Stream | Stream.dis.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
 
-## kms
-|Kind|CRD|Tested|
-|---|---|---|
-|Key|Key.kms.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## tms
+| Kind | CRD                                        | Tested             |
+| ---- | ------------------------------------------ | ------------------ |
+| Tags | Tags.tms.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+
+## bms
+| Kind   | CRD                                          | Tested             |
+| ------ | -------------------------------------------- | ------------------ |
+| Server | Server.bms.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+
+## eps
+| Kind    | CRD                                           | Tested             |
+| ------- | --------------------------------------------- | ------------------ |
+| Project | Project.eps.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
 
 ## ims
-|Kind|CRD|Tested|
-|---|---|---|
-|Image|Image.ims.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+| Kind  | CRD                                         | Tested             |
+| ----- | ------------------------------------------- | ------------------ |
+| Image | Image.ims.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
 
-## smn
-|Kind|CRD|Tested|
-|---|---|---|
-|Topic|Topic.smn.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
-|Subscription|Subscription.smn.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## eip
+| Kind         | CRD                                                | Tested             |
+| ------------ | -------------------------------------------------- | ------------------ |
+| EIPAssociate | EIPAssociate.eip.flexibleengine.upbound.io/v1beta1 | :white_check_mark: |
+| EIP          | EIP.eip.flexibleengine.upbound.io/v1beta1          | :white_check_mark: |
 
-## dis
-|Kind|CRD|Tested|
-|---|---|---|
-|Stream|Stream.dis.flexibleengine.upbound.io/v1beta1|:white_check_mark:|
+## cts
+| Kind    | CRD                                           | Tested |
+| ------- | --------------------------------------------- | ------ |
+| Tracker | Tracker.cts.flexibleengine.upbound.io/v1beta1 | :x:    |
+
+## antiddos
+| Kind     | CRD                                                 | Tested |
+| -------- | --------------------------------------------------- | ------ |
+| AntiDDoS | AntiDDoS.antiddos.flexibleengine.upbound.io/v1beta1 | :x:    |
diff --git a/package/crds/ecs.flexibleengine.upbound.io_instances.yaml b/package/crds/ecs.flexibleengine.upbound.io_instances.yaml
index 05b12384..6bd6e017 100644
--- a/package/crds/ecs.flexibleengine.upbound.io_instances.yaml
+++ b/package/crds/ecs.flexibleengine.upbound.io_instances.yaml
@@ -410,86 +410,6 @@ spec:
                         name:
                           description: A unique name for the resource.
                           type: string
-                        port:
-                          description: The port UUID of a network to attach to the
-                            server. Changing this creates a new server.
-                          type: string
-                        portRef:
-                          description: Reference to a Port in vpc to populate port.
-                          properties:
-                            name:
-                              description: Name of the referenced object.
-                              type: string
-                            policy:
-                              description: Policies for referencing.
-                              properties:
-                                resolution:
-                                  default: Required
-                                  description: Resolution specifies whether resolution
-                                    of this reference is required. The default is
-                                    'Required', which means the reconcile will fail
-                                    if the reference cannot be resolved. 'Optional'
-                                    means this reference will be a no-op if it cannot
-                                    be resolved.
-                                  enum:
-                                  - Required
-                                  - Optional
-                                  type: string
-                                resolve:
-                                  description: Resolve specifies when this reference
-                                    should be resolved. The default is 'IfNotPresent',
-                                    which will attempt to resolve the reference only
-                                    when the corresponding field is not present. Use
-                                    'Always' to resolve the reference on every reconcile.
-                                  enum:
-                                  - Always
-                                  - IfNotPresent
-                                  type: string
-                              type: object
-                          required:
-                          - name
-                          type: object
-                        portSelector:
-                          description: Selector for a Port in vpc to populate port.
-                          properties:
-                            matchControllerRef:
-                              description: MatchControllerRef ensures an object with
-                                the same controller reference as the selecting object
-                                is selected.
-                              type: boolean
-                            matchLabels:
-                              additionalProperties:
-                                type: string
-                              description: MatchLabels ensures an object with matching
-                                labels is selected.
-                              type: object
-                            policy:
-                              description: Policies for selection.
-                              properties:
-                                resolution:
-                                  default: Required
-                                  description: Resolution specifies whether resolution
-                                    of this reference is required. The default is
-                                    'Required', which means the reconcile will fail
-                                    if the reference cannot be resolved. 'Optional'
-                                    means this reference will be a no-op if it cannot
-                                    be resolved.
-                                  enum:
-                                  - Required
-                                  - Optional
-                                  type: string
-                                resolve:
-                                  description: Resolve specifies when this reference
-                                    should be resolved. The default is 'IfNotPresent',
-                                    which will attempt to resolve the reference only
-                                    when the corresponding field is not present. Use
-                                    'Always' to resolve the reference on every reconcile.
-                                  enum:
-                                  - Always
-                                  - IfNotPresent
-                                  type: string
-                              type: object
-                          type: object
                         uuid:
                           description: The network UUID to attach to the server. Changing
                             this creates a new server.
@@ -934,6 +854,10 @@ spec:
                       properties:
                         mac:
                           type: string
+                        port:
+                          description: The port UUID of a network to attach to the
+                            server. Changing this creates a new server.
+                          type: string
                       type: object
                     type: array
                   status:
diff --git a/package/crds/vpcep.flexibleengine.upbound.io_approvals.yaml b/package/crds/vpcep.flexibleengine.upbound.io_approvals.yaml
index eef9fcac..8b4cf602 100644
--- a/package/crds/vpcep.flexibleengine.upbound.io_approvals.yaml
+++ b/package/crds/vpcep.flexibleengine.upbound.io_approvals.yaml
@@ -155,7 +155,7 @@ spec:
                       this creates a new resource.
                     type: string
                   serviceIdRef:
-                    description: Reference to a Service to populate serviceId.
+                    description: Reference to a VPCEPService to populate serviceId.
                     properties:
                       name:
                         description: Name of the referenced object.
@@ -189,7 +189,7 @@ spec:
                     - name
                     type: object
                   serviceIdSelector:
-                    description: Selector for a Service to populate serviceId.
+                    description: Selector for a VPCEPService to populate serviceId.
                     properties:
                       matchControllerRef:
                         description: MatchControllerRef ensures an object with the
diff --git a/package/crds/vpcep.flexibleengine.upbound.io_endpoints.yaml b/package/crds/vpcep.flexibleengine.upbound.io_endpoints.yaml
index 10c252f9..8fb3f387 100644
--- a/package/crds/vpcep.flexibleengine.upbound.io_endpoints.yaml
+++ b/package/crds/vpcep.flexibleengine.upbound.io_endpoints.yaml
@@ -162,7 +162,7 @@ spec:
                       this creates a new VPC endpoint.
                     type: string
                   serviceIdRef:
-                    description: Reference to a Service to populate serviceId.
+                    description: Reference to a VPCEPService to populate serviceId.
                     properties:
                       name:
                         description: Name of the referenced object.
@@ -196,7 +196,7 @@ spec:
                     - name
                     type: object
                   serviceIdSelector:
-                    description: Selector for a Service to populate serviceId.
+                    description: Selector for a VPCEPService to populate serviceId.
                     properties:
                       matchControllerRef:
                         description: MatchControllerRef ensures an object with the
diff --git a/package/crds/vpcep.flexibleengine.upbound.io_services.yaml b/package/crds/vpcep.flexibleengine.upbound.io_vpcepservices.yaml
similarity index 97%
rename from package/crds/vpcep.flexibleengine.upbound.io_services.yaml
rename to package/crds/vpcep.flexibleengine.upbound.io_vpcepservices.yaml
index ef6e9d7f..51bab4e6 100644
--- a/package/crds/vpcep.flexibleengine.upbound.io_services.yaml
+++ b/package/crds/vpcep.flexibleengine.upbound.io_vpcepservices.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.8.0
   creationTimestamp: null
-  name: services.vpcep.flexibleengine.upbound.io
+  name: vpcepservices.vpcep.flexibleengine.upbound.io
 spec:
   group: vpcep.flexibleengine.upbound.io
   names:
@@ -13,10 +13,10 @@ spec:
     - crossplane
     - managed
     - flexibleengine
-    kind: Service
-    listKind: ServiceList
-    plural: services
-    singular: service
+    kind: VPCEPService
+    listKind: VPCEPServiceList
+    plural: vpcepservices
+    singular: vpcepservice
   scope: Cluster
   versions:
   - additionalPrinterColumns:
@@ -35,7 +35,8 @@ spec:
     name: v1beta1
     schema:
       openAPIV3Schema:
-        description: 'Service is the Schema for the Services API. ""page_title: "flexibleengine_vpcep_service"'
+        description: 'VPCEPService is the Schema for the VPCEPServices API. ""page_title:
+          "flexibleengine_vpcep_service"'
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -50,7 +51,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: ServiceSpec defines the desired state of Service
+            description: VPCEPServiceSpec defines the desired state of VPCEPService
             properties:
               deletionPolicy:
                 default: Delete
@@ -85,7 +86,7 @@ spec:
                       of the VPC endpoint service.
                     type: string
                   portIdRef:
-                    description: Reference to a Port in vpc to populate portId.
+                    description: Reference to a Instance in ecs to populate portId.
                     properties:
                       name:
                         description: Name of the referenced object.
@@ -119,7 +120,7 @@ spec:
                     - name
                     type: object
                   portIdSelector:
-                    description: Selector for a Port in vpc to populate portId.
+                    description: Selector for a Instance in ecs to populate portId.
                     properties:
                       matchControllerRef:
                         description: MatchControllerRef ensures an object with the
@@ -450,7 +451,7 @@ spec:
             - forProvider
             type: object
           status:
-            description: ServiceStatus defines the observed state of Service.
+            description: VPCEPServiceStatus defines the observed state of VPCEPService.
             properties:
               atProvider:
                 properties:
diff --git a/scripts/cli.py b/scripts/cli.py
index 0403da07..5f1d8f07 100644
--- a/scripts/cli.py
+++ b/scripts/cli.py
@@ -297,11 +297,13 @@ def kubectl():
     if debug:
         print("Labels:")
         print(Labels)
-        print("listLabelsRequired:")
-        print(listLabelsRequired)
 
     listLabelsRequiredFound = []
 
+    if debug:
+        print("listLabelsRequired:")
+        print(listLabelsRequired)
+
     for labelRequire in listLabelsRequired:
         for kind in Labels:
             if kind in Labels:
@@ -310,14 +312,22 @@ def kubectl():
                         if s not in listLabelsRequired:
                             listLabelsRequired.append(s)
 
+    if debug:
+        print("listLabelsRequired:")
+        print(listLabelsRequired)
+
     for labelRequire in listLabelsRequired:
         for kind in Labels:
             if kind in Labels:
-                if Labels[kind]["label"] in labelRequire:
+                if labelRequire in Labels[kind]["label"]:
                     listLabelsRequiredFound.append(Labels[kind]["label"])
                     fileToApply.append(Labels[kind]["file"])
                     break
 
+    if debug:
+        print("listLabelsRequiredFound:")
+        print(listLabelsRequiredFound)
+
     # If the resource is not found in the list of required resources
     foundErrors = False
     for labelRequire in listLabelsRequired:
@@ -330,7 +340,7 @@ def kubectl():
     for refRequire in listRefsRequired:
         for kind in Labels:
             if kind in Labels:
-                if Labels[kind]["name"] in refRequire:
+                if refRequire in Labels[kind]["name"]:
                     for s in Labels[kind]["refs"]:
                         if s not in listRefsRequired:
                             listRefsRequired.append(s)