diff --git a/submariner-k8s-broker/templates/crd.yaml b/submariner-k8s-broker/templates/crd.yaml
index c00408f..c94fc94 100644
--- a/submariner-k8s-broker/templates/crd.yaml
+++ b/submariner-k8s-broker/templates/crd.yaml
@@ -57,5 +57,18 @@ spec:
                   type: "string"
                 port:
                   type: "integer"
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: serviceexports.lighthouse.submariner.io
+spec:
+  group: lighthouse.submariner.io
+  version: v2alpha1
+  names:
+    kind: ServiceExport
+    plural: serviceexports
+    singular: serviceexport
+  scope: Namespaced
 {{- end -}}
 {{- end -}}
\ No newline at end of file
diff --git a/submariner-k8s-broker/templates/rbac.yaml b/submariner-k8s-broker/templates/rbac.yaml
index f494a4d..ae1c72b 100644
--- a/submariner-k8s-broker/templates/rbac.yaml
+++ b/submariner-k8s-broker/templates/rbac.yaml
@@ -13,7 +13,7 @@ rules:
   resources: ["clusters", "endpoints"]
   verbs: ["create", "get", "list", "watch", "patch", "update", "delete"]
 - apiGroups: ["lighthouse.submariner.io"]
-  resources: ["multiclusterservices"]
+  resources: ["*"]
   verbs: ["create", "get", "list", "watch", "patch", "update", "delete"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/submariner/templates/crd.yaml b/submariner/templates/crd.yaml
index ba42afc..bb4daad 100644
--- a/submariner/templates/crd.yaml
+++ b/submariner/templates/crd.yaml
@@ -76,5 +76,18 @@ spec:
                   type: "string"
                 port:
                   type: "integer"
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: serviceexports.lighthouse.submariner.io
+spec:
+  group: lighthouse.submariner.io
+  version: v2alpha1
+  names:
+    kind: ServiceExport
+    plural: serviceexports
+    singular: serviceexport
+  scope: Namespaced
 {{- end }}
 {{- end -}}
diff --git a/submariner/templates/rbac.yaml b/submariner/templates/rbac.yaml
index 2a89375..bfa94a3 100644
--- a/submariner/templates/rbac.yaml
+++ b/submariner/templates/rbac.yaml
@@ -121,7 +121,7 @@ rules:
     resources: ["services", "namespaces"]
     verbs: ["get", "list", "watch", "update"]
   - apiGroups: ["lighthouse.submariner.io"]
-    resources: ["multiclusterservices"]
+    resources: ["*"]
     verbs: ["create", "get", "list", "watch", "update", "delete"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1