diff --git a/generator/main.libsonnet b/generator/main.libsonnet
index ecc90c8..48e41a1 100644
--- a/generator/main.libsonnet
+++ b/generator/main.libsonnet
@@ -62,9 +62,9 @@ local mergeDocstring(group, version, name, obj, help='') =
 local compositions =
   std.foldl(
     function(acc, def)
-      local render = crdsonnet.xrd.render(def.definition, 'grafana.crossplane.io', processor);
+      local render = crdsonnet.xrd.render(def.definition, 'grafana.net', processor);
 
-      local group = helpers.getGroupKey(def.definition.spec.group, 'grafana.crossplane.io');
+      local group = helpers.getGroupKey(def.definition.spec.group, 'grafana.net');
       local version = 'v1alpha1';
       local kind = helpers.camelCaseKind(crdsonnet.xrd.getKind(def.definition));
 
diff --git a/generator/namespaced.libsonnet b/generator/namespaced.libsonnet
index d688f10..843679b 100644
--- a/generator/namespaced.libsonnet
+++ b/generator/namespaced.libsonnet
@@ -6,4 +6,28 @@ local crds =
     std.parseYaml(importstr './crds.yaml'),
   );
 
-std.map(cngen.fromCRD, crds)
+// XRD metadata.name consists of `plural+group`, for some resources this became longer than 63 characters, which resulted in this error:
+//   'cannot establish control of object: Composition.apiextensions.crossplane.io "stackserviceaccounttoken-namespaced" is invalid: metadata.labels: Invalid value:"xstackserviceaccounttokens.cloud.grafana.crossplane.io.namespaced": must be no more than 63 characters'
+local renameGroup(obj) =
+  assert std.trace(std.manifestJson(obj.definition.metadata), true);
+  local name = std.strReplace(obj.definition.metadata.name, 'crossplane.io', 'net');
+  assert std.length(name) <= 63 : 'CompositeResourceDefinition names must be no more than 63 characters';
+  obj + {
+    definition+: {
+      metadata+: {
+        name: name,
+      },
+      spec+: {
+        group: std.strReplace(super.group, 'crossplane.io', 'net'),
+      },
+    },
+  };
+
+std.foldr(
+  std.map,
+  [
+    renameGroup,
+    cngen.fromCRD,
+  ],
+  crds,
+)
diff --git a/grafanaplane/alerting/v1alpha1/contactPoint/main.libsonnet b/grafanaplane/alerting/v1alpha1/contactPoint/main.libsonnet
index 3c54a01..8ec396b 100644
--- a/grafanaplane/alerting/v1alpha1/contactPoint/main.libsonnet
+++ b/grafanaplane/alerting/v1alpha1/contactPoint/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'alerting.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'alerting.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/alerting/v1alpha1/messageTemplate/main.libsonnet b/grafanaplane/alerting/v1alpha1/messageTemplate/main.libsonnet
index b669499..870bfe1 100644
--- a/grafanaplane/alerting/v1alpha1/messageTemplate/main.libsonnet
+++ b/grafanaplane/alerting/v1alpha1/messageTemplate/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'alerting.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'alerting.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/alerting/v1alpha1/muteTiming/main.libsonnet b/grafanaplane/alerting/v1alpha1/muteTiming/main.libsonnet
index 4d7586a..88a7b84 100644
--- a/grafanaplane/alerting/v1alpha1/muteTiming/main.libsonnet
+++ b/grafanaplane/alerting/v1alpha1/muteTiming/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'alerting.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'alerting.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/alerting/v1alpha1/notificationPolicy/main.libsonnet b/grafanaplane/alerting/v1alpha1/notificationPolicy/main.libsonnet
index e330af4..6040c04 100644
--- a/grafanaplane/alerting/v1alpha1/notificationPolicy/main.libsonnet
+++ b/grafanaplane/alerting/v1alpha1/notificationPolicy/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'alerting.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'alerting.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/alerting/v1alpha1/ruleGroup/main.libsonnet b/grafanaplane/alerting/v1alpha1/ruleGroup/main.libsonnet
index cf520af..f79f2f1 100644
--- a/grafanaplane/alerting/v1alpha1/ruleGroup/main.libsonnet
+++ b/grafanaplane/alerting/v1alpha1/ruleGroup/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'alerting.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'alerting.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/cloud/v1alpha1/accessPolicy/main.libsonnet b/grafanaplane/cloud/v1alpha1/accessPolicy/main.libsonnet
index a008a94..1a68d41 100644
--- a/grafanaplane/cloud/v1alpha1/accessPolicy/main.libsonnet
+++ b/grafanaplane/cloud/v1alpha1/accessPolicy/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'cloud.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'cloud.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/cloud/v1alpha1/accessPolicyToken/main.libsonnet b/grafanaplane/cloud/v1alpha1/accessPolicyToken/main.libsonnet
index 87bf110..6ca46d1 100644
--- a/grafanaplane/cloud/v1alpha1/accessPolicyToken/main.libsonnet
+++ b/grafanaplane/cloud/v1alpha1/accessPolicyToken/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'cloud.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'cloud.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/cloud/v1alpha1/pluginInstallation/main.libsonnet b/grafanaplane/cloud/v1alpha1/pluginInstallation/main.libsonnet
index 47e704d..9bd1982 100644
--- a/grafanaplane/cloud/v1alpha1/pluginInstallation/main.libsonnet
+++ b/grafanaplane/cloud/v1alpha1/pluginInstallation/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'cloud.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'cloud.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/cloud/v1alpha1/stack/main.libsonnet b/grafanaplane/cloud/v1alpha1/stack/main.libsonnet
index 833e4c0..cd0bae6 100644
--- a/grafanaplane/cloud/v1alpha1/stack/main.libsonnet
+++ b/grafanaplane/cloud/v1alpha1/stack/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'cloud.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'cloud.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/cloud/v1alpha1/stackServiceAccount/main.libsonnet b/grafanaplane/cloud/v1alpha1/stackServiceAccount/main.libsonnet
index b0779d0..552f2e8 100644
--- a/grafanaplane/cloud/v1alpha1/stackServiceAccount/main.libsonnet
+++ b/grafanaplane/cloud/v1alpha1/stackServiceAccount/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'cloud.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'cloud.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/cloud/v1alpha1/stackServiceAccountToken/main.libsonnet b/grafanaplane/cloud/v1alpha1/stackServiceAccountToken/main.libsonnet
index e5a8c3f..3be77c4 100644
--- a/grafanaplane/cloud/v1alpha1/stackServiceAccountToken/main.libsonnet
+++ b/grafanaplane/cloud/v1alpha1/stackServiceAccountToken/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'cloud.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'cloud.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/enterprise/v1alpha1/dataSourcePermission/main.libsonnet b/grafanaplane/enterprise/v1alpha1/dataSourcePermission/main.libsonnet
index 35144a0..309899b 100644
--- a/grafanaplane/enterprise/v1alpha1/dataSourcePermission/main.libsonnet
+++ b/grafanaplane/enterprise/v1alpha1/dataSourcePermission/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'enterprise.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'enterprise.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/enterprise/v1alpha1/report/main.libsonnet b/grafanaplane/enterprise/v1alpha1/report/main.libsonnet
index e346778..a43c1ae 100644
--- a/grafanaplane/enterprise/v1alpha1/report/main.libsonnet
+++ b/grafanaplane/enterprise/v1alpha1/report/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'enterprise.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'enterprise.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/enterprise/v1alpha1/role/main.libsonnet b/grafanaplane/enterprise/v1alpha1/role/main.libsonnet
index d55d0f9..7783c1e 100644
--- a/grafanaplane/enterprise/v1alpha1/role/main.libsonnet
+++ b/grafanaplane/enterprise/v1alpha1/role/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'enterprise.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'enterprise.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/enterprise/v1alpha1/roleAssignment/main.libsonnet b/grafanaplane/enterprise/v1alpha1/roleAssignment/main.libsonnet
index 936f582..8c934ef 100644
--- a/grafanaplane/enterprise/v1alpha1/roleAssignment/main.libsonnet
+++ b/grafanaplane/enterprise/v1alpha1/roleAssignment/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'enterprise.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'enterprise.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/enterprise/v1alpha1/teamExternalGroup/main.libsonnet b/grafanaplane/enterprise/v1alpha1/teamExternalGroup/main.libsonnet
index e5ee62a..5f02516 100644
--- a/grafanaplane/enterprise/v1alpha1/teamExternalGroup/main.libsonnet
+++ b/grafanaplane/enterprise/v1alpha1/teamExternalGroup/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'enterprise.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'enterprise.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/ml/v1alpha1/holiday/main.libsonnet b/grafanaplane/ml/v1alpha1/holiday/main.libsonnet
index 4109e1f..4c273d6 100644
--- a/grafanaplane/ml/v1alpha1/holiday/main.libsonnet
+++ b/grafanaplane/ml/v1alpha1/holiday/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'ml.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'ml.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/ml/v1alpha1/job/main.libsonnet b/grafanaplane/ml/v1alpha1/job/main.libsonnet
index ea90471..2868fbb 100644
--- a/grafanaplane/ml/v1alpha1/job/main.libsonnet
+++ b/grafanaplane/ml/v1alpha1/job/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'ml.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'ml.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/ml/v1alpha1/outlierDetector/main.libsonnet b/grafanaplane/ml/v1alpha1/outlierDetector/main.libsonnet
index b80c3e7..6e3563f 100644
--- a/grafanaplane/ml/v1alpha1/outlierDetector/main.libsonnet
+++ b/grafanaplane/ml/v1alpha1/outlierDetector/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'ml.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'ml.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oncall/v1alpha1/escalation/main.libsonnet b/grafanaplane/oncall/v1alpha1/escalation/main.libsonnet
index 265e003..3df4fe8 100644
--- a/grafanaplane/oncall/v1alpha1/escalation/main.libsonnet
+++ b/grafanaplane/oncall/v1alpha1/escalation/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oncall.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oncall.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oncall/v1alpha1/escalationChain/main.libsonnet b/grafanaplane/oncall/v1alpha1/escalationChain/main.libsonnet
index df2f781..3883e62 100644
--- a/grafanaplane/oncall/v1alpha1/escalationChain/main.libsonnet
+++ b/grafanaplane/oncall/v1alpha1/escalationChain/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oncall.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oncall.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oncall/v1alpha1/integration/main.libsonnet b/grafanaplane/oncall/v1alpha1/integration/main.libsonnet
index 345e25f..ae877eb 100644
--- a/grafanaplane/oncall/v1alpha1/integration/main.libsonnet
+++ b/grafanaplane/oncall/v1alpha1/integration/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oncall.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oncall.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oncall/v1alpha1/onCallShift/main.libsonnet b/grafanaplane/oncall/v1alpha1/onCallShift/main.libsonnet
index 4c70cb9..5186127 100644
--- a/grafanaplane/oncall/v1alpha1/onCallShift/main.libsonnet
+++ b/grafanaplane/oncall/v1alpha1/onCallShift/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oncall.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oncall.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oncall/v1alpha1/outgoingWebhook/main.libsonnet b/grafanaplane/oncall/v1alpha1/outgoingWebhook/main.libsonnet
index 3f11774..6ad16b9 100644
--- a/grafanaplane/oncall/v1alpha1/outgoingWebhook/main.libsonnet
+++ b/grafanaplane/oncall/v1alpha1/outgoingWebhook/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oncall.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oncall.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oncall/v1alpha1/route/main.libsonnet b/grafanaplane/oncall/v1alpha1/route/main.libsonnet
index d75f89e..4f34312 100644
--- a/grafanaplane/oncall/v1alpha1/route/main.libsonnet
+++ b/grafanaplane/oncall/v1alpha1/route/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oncall.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oncall.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oncall/v1alpha1/schedule/main.libsonnet b/grafanaplane/oncall/v1alpha1/schedule/main.libsonnet
index 8be005a..29be86a 100644
--- a/grafanaplane/oncall/v1alpha1/schedule/main.libsonnet
+++ b/grafanaplane/oncall/v1alpha1/schedule/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oncall.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oncall.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oncall/v1alpha1/userNotificationRule/main.libsonnet b/grafanaplane/oncall/v1alpha1/userNotificationRule/main.libsonnet
index bccd332..94ef927 100644
--- a/grafanaplane/oncall/v1alpha1/userNotificationRule/main.libsonnet
+++ b/grafanaplane/oncall/v1alpha1/userNotificationRule/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oncall.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oncall.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/annotation/main.libsonnet b/grafanaplane/oss/v1alpha1/annotation/main.libsonnet
index e0ff018..3856164 100644
--- a/grafanaplane/oss/v1alpha1/annotation/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/annotation/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/dashboard/main.libsonnet b/grafanaplane/oss/v1alpha1/dashboard/main.libsonnet
index 2cc37eb..207d08d 100644
--- a/grafanaplane/oss/v1alpha1/dashboard/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/dashboard/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/dashboardPermission/main.libsonnet b/grafanaplane/oss/v1alpha1/dashboardPermission/main.libsonnet
index b286dce..ba62831 100644
--- a/grafanaplane/oss/v1alpha1/dashboardPermission/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/dashboardPermission/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/dashboardPublic/main.libsonnet b/grafanaplane/oss/v1alpha1/dashboardPublic/main.libsonnet
index fba2677..e8e9153 100644
--- a/grafanaplane/oss/v1alpha1/dashboardPublic/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/dashboardPublic/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/dataSource/main.libsonnet b/grafanaplane/oss/v1alpha1/dataSource/main.libsonnet
index 17278f0..1a9d52d 100644
--- a/grafanaplane/oss/v1alpha1/dataSource/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/dataSource/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/folder/main.libsonnet b/grafanaplane/oss/v1alpha1/folder/main.libsonnet
index 9cbf4f2..aa2f593 100644
--- a/grafanaplane/oss/v1alpha1/folder/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/folder/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/folderPermission/main.libsonnet b/grafanaplane/oss/v1alpha1/folderPermission/main.libsonnet
index 535f9af..6124a9d 100644
--- a/grafanaplane/oss/v1alpha1/folderPermission/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/folderPermission/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/libraryPanel/main.libsonnet b/grafanaplane/oss/v1alpha1/libraryPanel/main.libsonnet
index 214a0eb..69ca469 100644
--- a/grafanaplane/oss/v1alpha1/libraryPanel/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/libraryPanel/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/organization/main.libsonnet b/grafanaplane/oss/v1alpha1/organization/main.libsonnet
index bbe9c4d..ae77e5f 100644
--- a/grafanaplane/oss/v1alpha1/organization/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/organization/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/organizationPreferences/main.libsonnet b/grafanaplane/oss/v1alpha1/organizationPreferences/main.libsonnet
index 365c6c5..ed501b6 100644
--- a/grafanaplane/oss/v1alpha1/organizationPreferences/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/organizationPreferences/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/playlist/main.libsonnet b/grafanaplane/oss/v1alpha1/playlist/main.libsonnet
index a806858..0d6c3af 100644
--- a/grafanaplane/oss/v1alpha1/playlist/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/playlist/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/serviceAccount/main.libsonnet b/grafanaplane/oss/v1alpha1/serviceAccount/main.libsonnet
index 09c3c61..1929d77 100644
--- a/grafanaplane/oss/v1alpha1/serviceAccount/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/serviceAccount/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/serviceAccountPermission/main.libsonnet b/grafanaplane/oss/v1alpha1/serviceAccountPermission/main.libsonnet
index 189e88f..89f5edc 100644
--- a/grafanaplane/oss/v1alpha1/serviceAccountPermission/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/serviceAccountPermission/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/serviceAccountToken/main.libsonnet b/grafanaplane/oss/v1alpha1/serviceAccountToken/main.libsonnet
index f8b8414..309c322 100644
--- a/grafanaplane/oss/v1alpha1/serviceAccountToken/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/serviceAccountToken/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/ssoSettings/main.libsonnet b/grafanaplane/oss/v1alpha1/ssoSettings/main.libsonnet
index 1f74159..91d13d0 100644
--- a/grafanaplane/oss/v1alpha1/ssoSettings/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/ssoSettings/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/team/main.libsonnet b/grafanaplane/oss/v1alpha1/team/main.libsonnet
index d0c43b0..24f5d2f 100644
--- a/grafanaplane/oss/v1alpha1/team/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/team/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/oss/v1alpha1/user/main.libsonnet b/grafanaplane/oss/v1alpha1/user/main.libsonnet
index 8e3e121..f963a06 100644
--- a/grafanaplane/oss/v1alpha1/user/main.libsonnet
+++ b/grafanaplane/oss/v1alpha1/user/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'oss.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'oss.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/slo/v1alpha1/slo/main.libsonnet b/grafanaplane/slo/v1alpha1/slo/main.libsonnet
index c5b7dc6..4a82fa9 100644
--- a/grafanaplane/slo/v1alpha1/slo/main.libsonnet
+++ b/grafanaplane/slo/v1alpha1/slo/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'slo.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'slo.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/sm/v1alpha1/check/main.libsonnet b/grafanaplane/sm/v1alpha1/check/main.libsonnet
index c5c2e2c..0bc06e5 100644
--- a/grafanaplane/sm/v1alpha1/check/main.libsonnet
+++ b/grafanaplane/sm/v1alpha1/check/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'sm.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'sm.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/sm/v1alpha1/installation/main.libsonnet b/grafanaplane/sm/v1alpha1/installation/main.libsonnet
index 1adb185..3c9d136 100644
--- a/grafanaplane/sm/v1alpha1/installation/main.libsonnet
+++ b/grafanaplane/sm/v1alpha1/installation/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'sm.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'sm.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/grafanaplane/sm/v1alpha1/probe/main.libsonnet b/grafanaplane/sm/v1alpha1/probe/main.libsonnet
index 017a936..706ac20 100644
--- a/grafanaplane/sm/v1alpha1/probe/main.libsonnet
+++ b/grafanaplane/sm/v1alpha1/probe/main.libsonnet
@@ -7,7 +7,7 @@
     + self.metadata.withName(name),
   '#withApiVersion': { 'function': { args: [], help: '' } },
   withApiVersion(): {
-    apiVersion: 'sm.grafana.crossplane.io.namespaced/v1alpha1',
+    apiVersion: 'sm.grafana.net.namespaced/v1alpha1',
   },
   '#withKind': { 'function': { args: [], help: '' } },
   withKind(): {
diff --git a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-ContactPoint.yaml b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-ContactPoint.yaml
index 65c2e9f..ac47a3c 100644
--- a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-ContactPoint.yaml
+++ b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-ContactPoint.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xcontactpoints.alerting.grafana.crossplane.io.namespaced
+  name: xcontactpoints.alerting.grafana.net.namespaced
 spec:
   claimNames:
     kind: ContactPoint
     plural: contactpoints
   defaultCompositionRef:
     name: contactpoint-namespaced
-  group: alerting.grafana.crossplane.io.namespaced
+  group: alerting.grafana.net.namespaced
   names:
     kind: XContactPoint
     plural: xcontactpoints
diff --git a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-MessageTemplate.yaml b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-MessageTemplate.yaml
index 353c5f4..6fda41d 100644
--- a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-MessageTemplate.yaml
+++ b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-MessageTemplate.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xmessagetemplates.alerting.grafana.crossplane.io.namespaced
+  name: xmessagetemplates.alerting.grafana.net.namespaced
 spec:
   claimNames:
     kind: MessageTemplate
     plural: messagetemplates
   defaultCompositionRef:
     name: messagetemplate-namespaced
-  group: alerting.grafana.crossplane.io.namespaced
+  group: alerting.grafana.net.namespaced
   names:
     kind: XMessageTemplate
     plural: xmessagetemplates
diff --git a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-MuteTiming.yaml b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-MuteTiming.yaml
index c2ebdf4..e3aa6e3 100644
--- a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-MuteTiming.yaml
+++ b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-MuteTiming.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xmutetimings.alerting.grafana.crossplane.io.namespaced
+  name: xmutetimings.alerting.grafana.net.namespaced
 spec:
   claimNames:
     kind: MuteTiming
     plural: mutetimings
   defaultCompositionRef:
     name: mutetiming-namespaced
-  group: alerting.grafana.crossplane.io.namespaced
+  group: alerting.grafana.net.namespaced
   names:
     kind: XMuteTiming
     plural: xmutetimings
diff --git a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-NotificationPolicy.yaml b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-NotificationPolicy.yaml
index 2cdf3bc..348689f 100644
--- a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-NotificationPolicy.yaml
+++ b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-NotificationPolicy.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xnotificationpolicies.alerting.grafana.crossplane.io.namespaced
+  name: xnotificationpolicies.alerting.grafana.net.namespaced
 spec:
   claimNames:
     kind: NotificationPolicy
     plural: notificationpolicies
   defaultCompositionRef:
     name: notificationpolicy-namespaced
-  group: alerting.grafana.crossplane.io.namespaced
+  group: alerting.grafana.net.namespaced
   names:
     kind: XNotificationPolicy
     plural: xnotificationpolicies
diff --git a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-RuleGroup.yaml b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-RuleGroup.yaml
index 04b346c..d9186f8 100644
--- a/packages/grafana-namespaced-alerting/CompositeResourceDefinition-RuleGroup.yaml
+++ b/packages/grafana-namespaced-alerting/CompositeResourceDefinition-RuleGroup.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xrulegroups.alerting.grafana.crossplane.io.namespaced
+  name: xrulegroups.alerting.grafana.net.namespaced
 spec:
   claimNames:
     kind: RuleGroup
     plural: rulegroups
   defaultCompositionRef:
     name: rulegroup-namespaced
-  group: alerting.grafana.crossplane.io.namespaced
+  group: alerting.grafana.net.namespaced
   names:
     kind: XRuleGroup
     plural: xrulegroups
diff --git a/packages/grafana-namespaced-alerting/Composition-ContactPoint.yaml b/packages/grafana-namespaced-alerting/Composition-ContactPoint.yaml
index 3d08b76..cd58e1d 100644
--- a/packages/grafana-namespaced-alerting/Composition-ContactPoint.yaml
+++ b/packages/grafana-namespaced-alerting/Composition-ContactPoint.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xcontactpoints.alerting.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xcontactpoints.alerting.grafana.net.namespaced
   name: contactpoint-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: alerting.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: alerting.grafana.net.namespaced/v1alpha1
     kind: XContactPoint
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-alerting/Composition-MessageTemplate.yaml b/packages/grafana-namespaced-alerting/Composition-MessageTemplate.yaml
index c97db8e..0f2be42 100644
--- a/packages/grafana-namespaced-alerting/Composition-MessageTemplate.yaml
+++ b/packages/grafana-namespaced-alerting/Composition-MessageTemplate.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xmessagetemplates.alerting.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xmessagetemplates.alerting.grafana.net.namespaced
   name: messagetemplate-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: alerting.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: alerting.grafana.net.namespaced/v1alpha1
     kind: XMessageTemplate
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-alerting/Composition-MuteTiming.yaml b/packages/grafana-namespaced-alerting/Composition-MuteTiming.yaml
index 9318b99..33c9dd8 100644
--- a/packages/grafana-namespaced-alerting/Composition-MuteTiming.yaml
+++ b/packages/grafana-namespaced-alerting/Composition-MuteTiming.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xmutetimings.alerting.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xmutetimings.alerting.grafana.net.namespaced
   name: mutetiming-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: alerting.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: alerting.grafana.net.namespaced/v1alpha1
     kind: XMuteTiming
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-alerting/Composition-NotificationPolicy.yaml b/packages/grafana-namespaced-alerting/Composition-NotificationPolicy.yaml
index 9f0ad3b..7995c20 100644
--- a/packages/grafana-namespaced-alerting/Composition-NotificationPolicy.yaml
+++ b/packages/grafana-namespaced-alerting/Composition-NotificationPolicy.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xnotificationpolicies.alerting.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xnotificationpolicies.alerting.grafana.net.namespaced
   name: notificationpolicy-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: alerting.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: alerting.grafana.net.namespaced/v1alpha1
     kind: XNotificationPolicy
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-alerting/Composition-RuleGroup.yaml b/packages/grafana-namespaced-alerting/Composition-RuleGroup.yaml
index 5661c37..8523917 100644
--- a/packages/grafana-namespaced-alerting/Composition-RuleGroup.yaml
+++ b/packages/grafana-namespaced-alerting/Composition-RuleGroup.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xrulegroups.alerting.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xrulegroups.alerting.grafana.net.namespaced
   name: rulegroup-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: alerting.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: alerting.grafana.net.namespaced/v1alpha1
     kind: XRuleGroup
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-AccessPolicy.yaml b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-AccessPolicy.yaml
index 25674ea..84a28d0 100644
--- a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-AccessPolicy.yaml
+++ b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-AccessPolicy.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xaccesspolicies.cloud.grafana.crossplane.io.namespaced
+  name: xaccesspolicies.cloud.grafana.net.namespaced
 spec:
   claimNames:
     kind: AccessPolicy
     plural: accesspolicies
   defaultCompositionRef:
     name: accesspolicy-namespaced
-  group: cloud.grafana.crossplane.io.namespaced
+  group: cloud.grafana.net.namespaced
   names:
     kind: XAccessPolicy
     plural: xaccesspolicies
diff --git a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-AccessPolicyToken.yaml b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-AccessPolicyToken.yaml
index d5621f5..a275827 100644
--- a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-AccessPolicyToken.yaml
+++ b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-AccessPolicyToken.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xaccesspolicytokens.cloud.grafana.crossplane.io.namespaced
+  name: xaccesspolicytokens.cloud.grafana.net.namespaced
 spec:
   claimNames:
     kind: AccessPolicyToken
     plural: accesspolicytokens
   defaultCompositionRef:
     name: accesspolicytoken-namespaced
-  group: cloud.grafana.crossplane.io.namespaced
+  group: cloud.grafana.net.namespaced
   names:
     kind: XAccessPolicyToken
     plural: xaccesspolicytokens
diff --git a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-PluginInstallation.yaml b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-PluginInstallation.yaml
index b9ad3ea..936cb48 100644
--- a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-PluginInstallation.yaml
+++ b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-PluginInstallation.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xplugininstallations.cloud.grafana.crossplane.io.namespaced
+  name: xplugininstallations.cloud.grafana.net.namespaced
 spec:
   claimNames:
     kind: PluginInstallation
     plural: plugininstallations
   defaultCompositionRef:
     name: plugininstallation-namespaced
-  group: cloud.grafana.crossplane.io.namespaced
+  group: cloud.grafana.net.namespaced
   names:
     kind: XPluginInstallation
     plural: xplugininstallations
diff --git a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-Stack.yaml b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-Stack.yaml
index eb7dd70..3083264 100644
--- a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-Stack.yaml
+++ b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-Stack.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xstacks.cloud.grafana.crossplane.io.namespaced
+  name: xstacks.cloud.grafana.net.namespaced
 spec:
   claimNames:
     kind: Stack
     plural: stacks
   defaultCompositionRef:
     name: stack-namespaced
-  group: cloud.grafana.crossplane.io.namespaced
+  group: cloud.grafana.net.namespaced
   names:
     kind: XStack
     plural: xstacks
diff --git a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-StackServiceAccount.yaml b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-StackServiceAccount.yaml
index f1480be..4069c4f 100644
--- a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-StackServiceAccount.yaml
+++ b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-StackServiceAccount.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xstackserviceaccounts.cloud.grafana.crossplane.io.namespaced
+  name: xstackserviceaccounts.cloud.grafana.net.namespaced
 spec:
   claimNames:
     kind: StackServiceAccount
     plural: stackserviceaccounts
   defaultCompositionRef:
     name: stackserviceaccount-namespaced
-  group: cloud.grafana.crossplane.io.namespaced
+  group: cloud.grafana.net.namespaced
   names:
     kind: XStackServiceAccount
     plural: xstackserviceaccounts
diff --git a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-StackServiceAccountToken.yaml b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-StackServiceAccountToken.yaml
index 64eb27f..be22fe0 100644
--- a/packages/grafana-namespaced-cloud/CompositeResourceDefinition-StackServiceAccountToken.yaml
+++ b/packages/grafana-namespaced-cloud/CompositeResourceDefinition-StackServiceAccountToken.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xstackserviceaccounttokens.cloud.grafana.crossplane.io.namespaced
+  name: xstackserviceaccounttokens.cloud.grafana.net.namespaced
 spec:
   claimNames:
     kind: StackServiceAccountToken
     plural: stackserviceaccounttokens
   defaultCompositionRef:
     name: stackserviceaccounttoken-namespaced
-  group: cloud.grafana.crossplane.io.namespaced
+  group: cloud.grafana.net.namespaced
   names:
     kind: XStackServiceAccountToken
     plural: xstackserviceaccounttokens
diff --git a/packages/grafana-namespaced-cloud/Composition-AccessPolicy.yaml b/packages/grafana-namespaced-cloud/Composition-AccessPolicy.yaml
index 0dad348..5e3c319 100644
--- a/packages/grafana-namespaced-cloud/Composition-AccessPolicy.yaml
+++ b/packages/grafana-namespaced-cloud/Composition-AccessPolicy.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xaccesspolicies.cloud.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xaccesspolicies.cloud.grafana.net.namespaced
   name: accesspolicy-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: cloud.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: cloud.grafana.net.namespaced/v1alpha1
     kind: XAccessPolicy
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-cloud/Composition-AccessPolicyToken.yaml b/packages/grafana-namespaced-cloud/Composition-AccessPolicyToken.yaml
index 842971d..0399dad 100644
--- a/packages/grafana-namespaced-cloud/Composition-AccessPolicyToken.yaml
+++ b/packages/grafana-namespaced-cloud/Composition-AccessPolicyToken.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xaccesspolicytokens.cloud.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xaccesspolicytokens.cloud.grafana.net.namespaced
   name: accesspolicytoken-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: cloud.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: cloud.grafana.net.namespaced/v1alpha1
     kind: XAccessPolicyToken
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-cloud/Composition-PluginInstallation.yaml b/packages/grafana-namespaced-cloud/Composition-PluginInstallation.yaml
index 5207c7c..b1ff9f0 100644
--- a/packages/grafana-namespaced-cloud/Composition-PluginInstallation.yaml
+++ b/packages/grafana-namespaced-cloud/Composition-PluginInstallation.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xplugininstallations.cloud.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xplugininstallations.cloud.grafana.net.namespaced
   name: plugininstallation-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: cloud.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: cloud.grafana.net.namespaced/v1alpha1
     kind: XPluginInstallation
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-cloud/Composition-Stack.yaml b/packages/grafana-namespaced-cloud/Composition-Stack.yaml
index 4474cb7..5ba6088 100644
--- a/packages/grafana-namespaced-cloud/Composition-Stack.yaml
+++ b/packages/grafana-namespaced-cloud/Composition-Stack.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xstacks.cloud.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xstacks.cloud.grafana.net.namespaced
   name: stack-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: cloud.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: cloud.grafana.net.namespaced/v1alpha1
     kind: XStack
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-cloud/Composition-StackServiceAccount.yaml b/packages/grafana-namespaced-cloud/Composition-StackServiceAccount.yaml
index d800c6c..4f9ee35 100644
--- a/packages/grafana-namespaced-cloud/Composition-StackServiceAccount.yaml
+++ b/packages/grafana-namespaced-cloud/Composition-StackServiceAccount.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xstackserviceaccounts.cloud.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xstackserviceaccounts.cloud.grafana.net.namespaced
   name: stackserviceaccount-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: cloud.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: cloud.grafana.net.namespaced/v1alpha1
     kind: XStackServiceAccount
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-cloud/Composition-StackServiceAccountToken.yaml b/packages/grafana-namespaced-cloud/Composition-StackServiceAccountToken.yaml
index cb6a85f..ac1288b 100644
--- a/packages/grafana-namespaced-cloud/Composition-StackServiceAccountToken.yaml
+++ b/packages/grafana-namespaced-cloud/Composition-StackServiceAccountToken.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xstackserviceaccounttokens.cloud.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xstackserviceaccounttokens.cloud.grafana.net.namespaced
   name: stackserviceaccounttoken-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: cloud.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: cloud.grafana.net.namespaced/v1alpha1
     kind: XStackServiceAccountToken
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-DataSourcePermission.yaml b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-DataSourcePermission.yaml
index a3f526d..06d2db6 100644
--- a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-DataSourcePermission.yaml
+++ b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-DataSourcePermission.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xdatasourcepermissions.enterprise.grafana.crossplane.io.namespaced
+  name: xdatasourcepermissions.enterprise.grafana.net.namespaced
 spec:
   claimNames:
     kind: DataSourcePermission
     plural: datasourcepermissions
   defaultCompositionRef:
     name: datasourcepermission-namespaced
-  group: enterprise.grafana.crossplane.io.namespaced
+  group: enterprise.grafana.net.namespaced
   names:
     kind: XDataSourcePermission
     plural: xdatasourcepermissions
diff --git a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-Report.yaml b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-Report.yaml
index a5657ae..d8b1a07 100644
--- a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-Report.yaml
+++ b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-Report.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xreports.enterprise.grafana.crossplane.io.namespaced
+  name: xreports.enterprise.grafana.net.namespaced
 spec:
   claimNames:
     kind: Report
     plural: reports
   defaultCompositionRef:
     name: report-namespaced
-  group: enterprise.grafana.crossplane.io.namespaced
+  group: enterprise.grafana.net.namespaced
   names:
     kind: XReport
     plural: xreports
diff --git a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-Role.yaml b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-Role.yaml
index d47f40a..0593835 100644
--- a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-Role.yaml
+++ b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-Role.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xroles.enterprise.grafana.crossplane.io.namespaced
+  name: xroles.enterprise.grafana.net.namespaced
 spec:
   claimNames:
     kind: Role
     plural: roles
   defaultCompositionRef:
     name: role-namespaced
-  group: enterprise.grafana.crossplane.io.namespaced
+  group: enterprise.grafana.net.namespaced
   names:
     kind: XRole
     plural: xroles
diff --git a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-RoleAssignment.yaml b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-RoleAssignment.yaml
index 27c95e4..16e1aa6 100644
--- a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-RoleAssignment.yaml
+++ b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-RoleAssignment.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xroleassignments.enterprise.grafana.crossplane.io.namespaced
+  name: xroleassignments.enterprise.grafana.net.namespaced
 spec:
   claimNames:
     kind: RoleAssignment
     plural: roleassignments
   defaultCompositionRef:
     name: roleassignment-namespaced
-  group: enterprise.grafana.crossplane.io.namespaced
+  group: enterprise.grafana.net.namespaced
   names:
     kind: XRoleAssignment
     plural: xroleassignments
diff --git a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-TeamExternalGroup.yaml b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-TeamExternalGroup.yaml
index 50e7083..5c18aed 100644
--- a/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-TeamExternalGroup.yaml
+++ b/packages/grafana-namespaced-enterprise/CompositeResourceDefinition-TeamExternalGroup.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xteamexternalgroups.enterprise.grafana.crossplane.io.namespaced
+  name: xteamexternalgroups.enterprise.grafana.net.namespaced
 spec:
   claimNames:
     kind: TeamExternalGroup
     plural: teamexternalgroups
   defaultCompositionRef:
     name: teamexternalgroup-namespaced
-  group: enterprise.grafana.crossplane.io.namespaced
+  group: enterprise.grafana.net.namespaced
   names:
     kind: XTeamExternalGroup
     plural: xteamexternalgroups
diff --git a/packages/grafana-namespaced-enterprise/Composition-DataSourcePermission.yaml b/packages/grafana-namespaced-enterprise/Composition-DataSourcePermission.yaml
index d27b781..c89577e 100644
--- a/packages/grafana-namespaced-enterprise/Composition-DataSourcePermission.yaml
+++ b/packages/grafana-namespaced-enterprise/Composition-DataSourcePermission.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xdatasourcepermissions.enterprise.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xdatasourcepermissions.enterprise.grafana.net.namespaced
   name: datasourcepermission-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: enterprise.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: enterprise.grafana.net.namespaced/v1alpha1
     kind: XDataSourcePermission
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-enterprise/Composition-Report.yaml b/packages/grafana-namespaced-enterprise/Composition-Report.yaml
index f5fca15..8ecbcb2 100644
--- a/packages/grafana-namespaced-enterprise/Composition-Report.yaml
+++ b/packages/grafana-namespaced-enterprise/Composition-Report.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xreports.enterprise.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xreports.enterprise.grafana.net.namespaced
   name: report-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: enterprise.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: enterprise.grafana.net.namespaced/v1alpha1
     kind: XReport
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-enterprise/Composition-Role.yaml b/packages/grafana-namespaced-enterprise/Composition-Role.yaml
index 329a9cf..e816333 100644
--- a/packages/grafana-namespaced-enterprise/Composition-Role.yaml
+++ b/packages/grafana-namespaced-enterprise/Composition-Role.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xroles.enterprise.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xroles.enterprise.grafana.net.namespaced
   name: role-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: enterprise.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: enterprise.grafana.net.namespaced/v1alpha1
     kind: XRole
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-enterprise/Composition-RoleAssignment.yaml b/packages/grafana-namespaced-enterprise/Composition-RoleAssignment.yaml
index ea4036e..2b94039 100644
--- a/packages/grafana-namespaced-enterprise/Composition-RoleAssignment.yaml
+++ b/packages/grafana-namespaced-enterprise/Composition-RoleAssignment.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xroleassignments.enterprise.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xroleassignments.enterprise.grafana.net.namespaced
   name: roleassignment-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: enterprise.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: enterprise.grafana.net.namespaced/v1alpha1
     kind: XRoleAssignment
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-enterprise/Composition-TeamExternalGroup.yaml b/packages/grafana-namespaced-enterprise/Composition-TeamExternalGroup.yaml
index 71df806..0e1b427 100644
--- a/packages/grafana-namespaced-enterprise/Composition-TeamExternalGroup.yaml
+++ b/packages/grafana-namespaced-enterprise/Composition-TeamExternalGroup.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xteamexternalgroups.enterprise.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xteamexternalgroups.enterprise.grafana.net.namespaced
   name: teamexternalgroup-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: enterprise.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: enterprise.grafana.net.namespaced/v1alpha1
     kind: XTeamExternalGroup
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-ml/CompositeResourceDefinition-Holiday.yaml b/packages/grafana-namespaced-ml/CompositeResourceDefinition-Holiday.yaml
index 04a4caf..99942df 100644
--- a/packages/grafana-namespaced-ml/CompositeResourceDefinition-Holiday.yaml
+++ b/packages/grafana-namespaced-ml/CompositeResourceDefinition-Holiday.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xholidays.ml.grafana.crossplane.io.namespaced
+  name: xholidays.ml.grafana.net.namespaced
 spec:
   claimNames:
     kind: Holiday
     plural: holidays
   defaultCompositionRef:
     name: holiday-namespaced
-  group: ml.grafana.crossplane.io.namespaced
+  group: ml.grafana.net.namespaced
   names:
     kind: XHoliday
     plural: xholidays
diff --git a/packages/grafana-namespaced-ml/CompositeResourceDefinition-Job.yaml b/packages/grafana-namespaced-ml/CompositeResourceDefinition-Job.yaml
index 699e44e..422a369 100644
--- a/packages/grafana-namespaced-ml/CompositeResourceDefinition-Job.yaml
+++ b/packages/grafana-namespaced-ml/CompositeResourceDefinition-Job.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xjobs.ml.grafana.crossplane.io.namespaced
+  name: xjobs.ml.grafana.net.namespaced
 spec:
   claimNames:
     kind: Job
     plural: jobs
   defaultCompositionRef:
     name: job-namespaced
-  group: ml.grafana.crossplane.io.namespaced
+  group: ml.grafana.net.namespaced
   names:
     kind: XJob
     plural: xjobs
diff --git a/packages/grafana-namespaced-ml/CompositeResourceDefinition-OutlierDetector.yaml b/packages/grafana-namespaced-ml/CompositeResourceDefinition-OutlierDetector.yaml
index 3ea485e..8aa7daf 100644
--- a/packages/grafana-namespaced-ml/CompositeResourceDefinition-OutlierDetector.yaml
+++ b/packages/grafana-namespaced-ml/CompositeResourceDefinition-OutlierDetector.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xoutlierdetectors.ml.grafana.crossplane.io.namespaced
+  name: xoutlierdetectors.ml.grafana.net.namespaced
 spec:
   claimNames:
     kind: OutlierDetector
     plural: outlierdetectors
   defaultCompositionRef:
     name: outlierdetector-namespaced
-  group: ml.grafana.crossplane.io.namespaced
+  group: ml.grafana.net.namespaced
   names:
     kind: XOutlierDetector
     plural: xoutlierdetectors
diff --git a/packages/grafana-namespaced-ml/Composition-Holiday.yaml b/packages/grafana-namespaced-ml/Composition-Holiday.yaml
index e4d3368..89cc452 100644
--- a/packages/grafana-namespaced-ml/Composition-Holiday.yaml
+++ b/packages/grafana-namespaced-ml/Composition-Holiday.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xholidays.ml.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xholidays.ml.grafana.net.namespaced
   name: holiday-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: ml.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: ml.grafana.net.namespaced/v1alpha1
     kind: XHoliday
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-ml/Composition-Job.yaml b/packages/grafana-namespaced-ml/Composition-Job.yaml
index 15c9711..d212dfd 100644
--- a/packages/grafana-namespaced-ml/Composition-Job.yaml
+++ b/packages/grafana-namespaced-ml/Composition-Job.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xjobs.ml.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xjobs.ml.grafana.net.namespaced
   name: job-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: ml.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: ml.grafana.net.namespaced/v1alpha1
     kind: XJob
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-ml/Composition-OutlierDetector.yaml b/packages/grafana-namespaced-ml/Composition-OutlierDetector.yaml
index ce03791..6b4e5ea 100644
--- a/packages/grafana-namespaced-ml/Composition-OutlierDetector.yaml
+++ b/packages/grafana-namespaced-ml/Composition-OutlierDetector.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xoutlierdetectors.ml.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xoutlierdetectors.ml.grafana.net.namespaced
   name: outlierdetector-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: ml.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: ml.grafana.net.namespaced/v1alpha1
     kind: XOutlierDetector
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Escalation.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Escalation.yaml
index 65fdeda..15e96e6 100644
--- a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Escalation.yaml
+++ b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Escalation.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xescalations.oncall.grafana.crossplane.io.namespaced
+  name: xescalations.oncall.grafana.net.namespaced
 spec:
   claimNames:
     kind: Escalation
     plural: escalations
   defaultCompositionRef:
     name: escalation-namespaced
-  group: oncall.grafana.crossplane.io.namespaced
+  group: oncall.grafana.net.namespaced
   names:
     kind: XEscalation
     plural: xescalations
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-EscalationChain.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-EscalationChain.yaml
index cb14561..e3766c4 100644
--- a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-EscalationChain.yaml
+++ b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-EscalationChain.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xescalationchains.oncall.grafana.crossplane.io.namespaced
+  name: xescalationchains.oncall.grafana.net.namespaced
 spec:
   claimNames:
     kind: EscalationChain
     plural: escalationchains
   defaultCompositionRef:
     name: escalationchain-namespaced
-  group: oncall.grafana.crossplane.io.namespaced
+  group: oncall.grafana.net.namespaced
   names:
     kind: XEscalationChain
     plural: xescalationchains
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Integration.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Integration.yaml
index 740111a..0c63eea 100644
--- a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Integration.yaml
+++ b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Integration.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xintegrations.oncall.grafana.crossplane.io.namespaced
+  name: xintegrations.oncall.grafana.net.namespaced
 spec:
   claimNames:
     kind: Integration
     plural: integrations
   defaultCompositionRef:
     name: integration-namespaced
-  group: oncall.grafana.crossplane.io.namespaced
+  group: oncall.grafana.net.namespaced
   names:
     kind: XIntegration
     plural: xintegrations
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-OnCallShift.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-OnCallShift.yaml
index a662da7..2d7b7eb 100644
--- a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-OnCallShift.yaml
+++ b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-OnCallShift.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xoncallshifts.oncall.grafana.crossplane.io.namespaced
+  name: xoncallshifts.oncall.grafana.net.namespaced
 spec:
   claimNames:
     kind: OnCallShift
     plural: oncallshifts
   defaultCompositionRef:
     name: oncallshift-namespaced
-  group: oncall.grafana.crossplane.io.namespaced
+  group: oncall.grafana.net.namespaced
   names:
     kind: XOnCallShift
     plural: xoncallshifts
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-OutgoingWebhook.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-OutgoingWebhook.yaml
index fdfc39d..1a7c770 100644
--- a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-OutgoingWebhook.yaml
+++ b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-OutgoingWebhook.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xoutgoingwebhooks.oncall.grafana.crossplane.io.namespaced
+  name: xoutgoingwebhooks.oncall.grafana.net.namespaced
 spec:
   claimNames:
     kind: OutgoingWebhook
     plural: outgoingwebhooks
   defaultCompositionRef:
     name: outgoingwebhook-namespaced
-  group: oncall.grafana.crossplane.io.namespaced
+  group: oncall.grafana.net.namespaced
   names:
     kind: XOutgoingWebhook
     plural: xoutgoingwebhooks
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Route.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Route.yaml
index 2358c34..6201e20 100644
--- a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Route.yaml
+++ b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Route.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xroutes.oncall.grafana.crossplane.io.namespaced
+  name: xroutes.oncall.grafana.net.namespaced
 spec:
   claimNames:
     kind: Route
     plural: routes
   defaultCompositionRef:
     name: route-namespaced
-  group: oncall.grafana.crossplane.io.namespaced
+  group: oncall.grafana.net.namespaced
   names:
     kind: XRoute
     plural: xroutes
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Schedule.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Schedule.yaml
index 9edac76..a332288 100644
--- a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Schedule.yaml
+++ b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-Schedule.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xschedules.oncall.grafana.crossplane.io.namespaced
+  name: xschedules.oncall.grafana.net.namespaced
 spec:
   claimNames:
     kind: Schedule
     plural: schedules
   defaultCompositionRef:
     name: schedule-namespaced
-  group: oncall.grafana.crossplane.io.namespaced
+  group: oncall.grafana.net.namespaced
   names:
     kind: XSchedule
     plural: xschedules
diff --git a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-UserNotificationRule.yaml b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-UserNotificationRule.yaml
index c146222..e7a91cb 100644
--- a/packages/grafana-namespaced-oncall/CompositeResourceDefinition-UserNotificationRule.yaml
+++ b/packages/grafana-namespaced-oncall/CompositeResourceDefinition-UserNotificationRule.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xusernotificationrules.oncall.grafana.crossplane.io.namespaced
+  name: xusernotificationrules.oncall.grafana.net.namespaced
 spec:
   claimNames:
     kind: UserNotificationRule
     plural: usernotificationrules
   defaultCompositionRef:
     name: usernotificationrule-namespaced
-  group: oncall.grafana.crossplane.io.namespaced
+  group: oncall.grafana.net.namespaced
   names:
     kind: XUserNotificationRule
     plural: xusernotificationrules
diff --git a/packages/grafana-namespaced-oncall/Composition-Escalation.yaml b/packages/grafana-namespaced-oncall/Composition-Escalation.yaml
index 7563cb8..7c2f07b 100644
--- a/packages/grafana-namespaced-oncall/Composition-Escalation.yaml
+++ b/packages/grafana-namespaced-oncall/Composition-Escalation.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xescalations.oncall.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xescalations.oncall.grafana.net.namespaced
   name: escalation-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oncall.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oncall.grafana.net.namespaced/v1alpha1
     kind: XEscalation
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oncall/Composition-EscalationChain.yaml b/packages/grafana-namespaced-oncall/Composition-EscalationChain.yaml
index 546d01f..5138ce1 100644
--- a/packages/grafana-namespaced-oncall/Composition-EscalationChain.yaml
+++ b/packages/grafana-namespaced-oncall/Composition-EscalationChain.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xescalationchains.oncall.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xescalationchains.oncall.grafana.net.namespaced
   name: escalationchain-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oncall.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oncall.grafana.net.namespaced/v1alpha1
     kind: XEscalationChain
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oncall/Composition-Integration.yaml b/packages/grafana-namespaced-oncall/Composition-Integration.yaml
index 43dfe0d..ea5fe3a 100644
--- a/packages/grafana-namespaced-oncall/Composition-Integration.yaml
+++ b/packages/grafana-namespaced-oncall/Composition-Integration.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xintegrations.oncall.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xintegrations.oncall.grafana.net.namespaced
   name: integration-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oncall.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oncall.grafana.net.namespaced/v1alpha1
     kind: XIntegration
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oncall/Composition-OnCallShift.yaml b/packages/grafana-namespaced-oncall/Composition-OnCallShift.yaml
index a3f4f61..93f4cd2 100644
--- a/packages/grafana-namespaced-oncall/Composition-OnCallShift.yaml
+++ b/packages/grafana-namespaced-oncall/Composition-OnCallShift.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xoncallshifts.oncall.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xoncallshifts.oncall.grafana.net.namespaced
   name: oncallshift-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oncall.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oncall.grafana.net.namespaced/v1alpha1
     kind: XOnCallShift
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oncall/Composition-OutgoingWebhook.yaml b/packages/grafana-namespaced-oncall/Composition-OutgoingWebhook.yaml
index f9012cf..3187776 100644
--- a/packages/grafana-namespaced-oncall/Composition-OutgoingWebhook.yaml
+++ b/packages/grafana-namespaced-oncall/Composition-OutgoingWebhook.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xoutgoingwebhooks.oncall.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xoutgoingwebhooks.oncall.grafana.net.namespaced
   name: outgoingwebhook-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oncall.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oncall.grafana.net.namespaced/v1alpha1
     kind: XOutgoingWebhook
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oncall/Composition-Route.yaml b/packages/grafana-namespaced-oncall/Composition-Route.yaml
index 987a5e2..2ff9b3b 100644
--- a/packages/grafana-namespaced-oncall/Composition-Route.yaml
+++ b/packages/grafana-namespaced-oncall/Composition-Route.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xroutes.oncall.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xroutes.oncall.grafana.net.namespaced
   name: route-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oncall.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oncall.grafana.net.namespaced/v1alpha1
     kind: XRoute
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oncall/Composition-Schedule.yaml b/packages/grafana-namespaced-oncall/Composition-Schedule.yaml
index a3d0db7..7e117d8 100644
--- a/packages/grafana-namespaced-oncall/Composition-Schedule.yaml
+++ b/packages/grafana-namespaced-oncall/Composition-Schedule.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xschedules.oncall.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xschedules.oncall.grafana.net.namespaced
   name: schedule-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oncall.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oncall.grafana.net.namespaced/v1alpha1
     kind: XSchedule
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oncall/Composition-UserNotificationRule.yaml b/packages/grafana-namespaced-oncall/Composition-UserNotificationRule.yaml
index bf6b503..265a040 100644
--- a/packages/grafana-namespaced-oncall/Composition-UserNotificationRule.yaml
+++ b/packages/grafana-namespaced-oncall/Composition-UserNotificationRule.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xusernotificationrules.oncall.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xusernotificationrules.oncall.grafana.net.namespaced
   name: usernotificationrule-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oncall.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oncall.grafana.net.namespaced/v1alpha1
     kind: XUserNotificationRule
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Annotation.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Annotation.yaml
index 56d226e..90ad4d6 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Annotation.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Annotation.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xannotations.oss.grafana.crossplane.io.namespaced
+  name: xannotations.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: Annotation
     plural: annotations
   defaultCompositionRef:
     name: annotation-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XAnnotation
     plural: xannotations
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Dashboard.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Dashboard.yaml
index 95937cc..0e4f504 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Dashboard.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Dashboard.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xdashboards.oss.grafana.crossplane.io.namespaced
+  name: xdashboards.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: Dashboard
     plural: dashboards
   defaultCompositionRef:
     name: dashboard-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XDashboard
     plural: xdashboards
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-DashboardPermission.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-DashboardPermission.yaml
index 1f16ad2..cb34419 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-DashboardPermission.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-DashboardPermission.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xdashboardpermissions.oss.grafana.crossplane.io.namespaced
+  name: xdashboardpermissions.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: DashboardPermission
     plural: dashboardpermissions
   defaultCompositionRef:
     name: dashboardpermission-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XDashboardPermission
     plural: xdashboardpermissions
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-DashboardPublic.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-DashboardPublic.yaml
index ebc1316..15ecc3b 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-DashboardPublic.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-DashboardPublic.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xdashboardpublics.oss.grafana.crossplane.io.namespaced
+  name: xdashboardpublics.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: DashboardPublic
     plural: dashboardpublics
   defaultCompositionRef:
     name: dashboardpublic-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XDashboardPublic
     plural: xdashboardpublics
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-DataSource.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-DataSource.yaml
index 8e2a463..c37e7d9 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-DataSource.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-DataSource.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xdatasources.oss.grafana.crossplane.io.namespaced
+  name: xdatasources.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: DataSource
     plural: datasources
   defaultCompositionRef:
     name: datasource-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XDataSource
     plural: xdatasources
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Folder.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Folder.yaml
index 17b896d..807f52e 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Folder.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Folder.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xfolders.oss.grafana.crossplane.io.namespaced
+  name: xfolders.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: Folder
     plural: folders
   defaultCompositionRef:
     name: folder-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XFolder
     plural: xfolders
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-FolderPermission.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-FolderPermission.yaml
index 2c409d8..d6ad79d 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-FolderPermission.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-FolderPermission.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xfolderpermissions.oss.grafana.crossplane.io.namespaced
+  name: xfolderpermissions.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: FolderPermission
     plural: folderpermissions
   defaultCompositionRef:
     name: folderpermission-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XFolderPermission
     plural: xfolderpermissions
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-LibraryPanel.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-LibraryPanel.yaml
index 8d385d0..4c13613 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-LibraryPanel.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-LibraryPanel.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xlibrarypanels.oss.grafana.crossplane.io.namespaced
+  name: xlibrarypanels.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: LibraryPanel
     plural: librarypanels
   defaultCompositionRef:
     name: librarypanel-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XLibraryPanel
     plural: xlibrarypanels
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Organization.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Organization.yaml
index aab2a1b..0d2f64c 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Organization.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Organization.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xorganizations.oss.grafana.crossplane.io.namespaced
+  name: xorganizations.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: Organization
     plural: organizations
   defaultCompositionRef:
     name: organization-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XOrganization
     plural: xorganizations
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-OrganizationPreferences.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-OrganizationPreferences.yaml
index da982c1..b9c7339 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-OrganizationPreferences.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-OrganizationPreferences.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xorganizationpreferences.oss.grafana.crossplane.io.namespaced
+  name: xorganizationpreferences.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: OrganizationPreferences
     plural: organizationpreferences
   defaultCompositionRef:
     name: organizationpreferences-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XOrganizationPreferences
     plural: xorganizationpreferences
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Playlist.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Playlist.yaml
index a02b7c7..53473be 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Playlist.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Playlist.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xplaylists.oss.grafana.crossplane.io.namespaced
+  name: xplaylists.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: Playlist
     plural: playlists
   defaultCompositionRef:
     name: playlist-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XPlaylist
     plural: xplaylists
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccount.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccount.yaml
index c23a174..243288f 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccount.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccount.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xserviceaccounts.oss.grafana.crossplane.io.namespaced
+  name: xserviceaccounts.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: ServiceAccount
     plural: serviceaccounts
   defaultCompositionRef:
     name: serviceaccount-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XServiceAccount
     plural: xserviceaccounts
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccountPermission.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccountPermission.yaml
index 1a15bfb..985ebec 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccountPermission.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccountPermission.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xserviceaccountpermissions.oss.grafana.crossplane.io.namespaced
+  name: xserviceaccountpermissions.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: ServiceAccountPermission
     plural: serviceaccountpermissions
   defaultCompositionRef:
     name: serviceaccountpermission-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XServiceAccountPermission
     plural: xserviceaccountpermissions
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccountToken.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccountToken.yaml
index f413327..eb05d3b 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccountToken.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-ServiceAccountToken.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xserviceaccounttokens.oss.grafana.crossplane.io.namespaced
+  name: xserviceaccounttokens.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: ServiceAccountToken
     plural: serviceaccounttokens
   defaultCompositionRef:
     name: serviceaccounttoken-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XServiceAccountToken
     plural: xserviceaccounttokens
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-SsoSettings.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-SsoSettings.yaml
index f40b25a..088e05d 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-SsoSettings.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-SsoSettings.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xssosettings.oss.grafana.crossplane.io.namespaced
+  name: xssosettings.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: SsoSettings
     plural: ssosettings
   defaultCompositionRef:
     name: ssosettings-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XSsoSettings
     plural: xssosettings
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Team.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Team.yaml
index b29173a..4ab911f 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-Team.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-Team.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xteams.oss.grafana.crossplane.io.namespaced
+  name: xteams.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: Team
     plural: teams
   defaultCompositionRef:
     name: team-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XTeam
     plural: xteams
diff --git a/packages/grafana-namespaced-oss/CompositeResourceDefinition-User.yaml b/packages/grafana-namespaced-oss/CompositeResourceDefinition-User.yaml
index 436a590..d673d1a 100644
--- a/packages/grafana-namespaced-oss/CompositeResourceDefinition-User.yaml
+++ b/packages/grafana-namespaced-oss/CompositeResourceDefinition-User.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xusers.oss.grafana.crossplane.io.namespaced
+  name: xusers.oss.grafana.net.namespaced
 spec:
   claimNames:
     kind: User
     plural: users
   defaultCompositionRef:
     name: user-namespaced
-  group: oss.grafana.crossplane.io.namespaced
+  group: oss.grafana.net.namespaced
   names:
     kind: XUser
     plural: xusers
diff --git a/packages/grafana-namespaced-oss/Composition-Annotation.yaml b/packages/grafana-namespaced-oss/Composition-Annotation.yaml
index 3730ade..6e88489 100644
--- a/packages/grafana-namespaced-oss/Composition-Annotation.yaml
+++ b/packages/grafana-namespaced-oss/Composition-Annotation.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xannotations.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xannotations.oss.grafana.net.namespaced
   name: annotation-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XAnnotation
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-Dashboard.yaml b/packages/grafana-namespaced-oss/Composition-Dashboard.yaml
index e738f9b..759f71e 100644
--- a/packages/grafana-namespaced-oss/Composition-Dashboard.yaml
+++ b/packages/grafana-namespaced-oss/Composition-Dashboard.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xdashboards.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xdashboards.oss.grafana.net.namespaced
   name: dashboard-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XDashboard
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-DashboardPermission.yaml b/packages/grafana-namespaced-oss/Composition-DashboardPermission.yaml
index 46a7b1a..f39a933 100644
--- a/packages/grafana-namespaced-oss/Composition-DashboardPermission.yaml
+++ b/packages/grafana-namespaced-oss/Composition-DashboardPermission.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xdashboardpermissions.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xdashboardpermissions.oss.grafana.net.namespaced
   name: dashboardpermission-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XDashboardPermission
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-DashboardPublic.yaml b/packages/grafana-namespaced-oss/Composition-DashboardPublic.yaml
index 807dceb..29f3a11 100644
--- a/packages/grafana-namespaced-oss/Composition-DashboardPublic.yaml
+++ b/packages/grafana-namespaced-oss/Composition-DashboardPublic.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xdashboardpublics.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xdashboardpublics.oss.grafana.net.namespaced
   name: dashboardpublic-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XDashboardPublic
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-DataSource.yaml b/packages/grafana-namespaced-oss/Composition-DataSource.yaml
index eca5d1b..8d39e09 100644
--- a/packages/grafana-namespaced-oss/Composition-DataSource.yaml
+++ b/packages/grafana-namespaced-oss/Composition-DataSource.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xdatasources.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xdatasources.oss.grafana.net.namespaced
   name: datasource-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XDataSource
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-Folder.yaml b/packages/grafana-namespaced-oss/Composition-Folder.yaml
index 07aee36..9427b75 100644
--- a/packages/grafana-namespaced-oss/Composition-Folder.yaml
+++ b/packages/grafana-namespaced-oss/Composition-Folder.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xfolders.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xfolders.oss.grafana.net.namespaced
   name: folder-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XFolder
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-FolderPermission.yaml b/packages/grafana-namespaced-oss/Composition-FolderPermission.yaml
index 4073501..f3c694f 100644
--- a/packages/grafana-namespaced-oss/Composition-FolderPermission.yaml
+++ b/packages/grafana-namespaced-oss/Composition-FolderPermission.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xfolderpermissions.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xfolderpermissions.oss.grafana.net.namespaced
   name: folderpermission-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XFolderPermission
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-LibraryPanel.yaml b/packages/grafana-namespaced-oss/Composition-LibraryPanel.yaml
index 9d28db7..9d37603 100644
--- a/packages/grafana-namespaced-oss/Composition-LibraryPanel.yaml
+++ b/packages/grafana-namespaced-oss/Composition-LibraryPanel.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xlibrarypanels.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xlibrarypanels.oss.grafana.net.namespaced
   name: librarypanel-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XLibraryPanel
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-Organization.yaml b/packages/grafana-namespaced-oss/Composition-Organization.yaml
index c3b39d8..3e04228 100644
--- a/packages/grafana-namespaced-oss/Composition-Organization.yaml
+++ b/packages/grafana-namespaced-oss/Composition-Organization.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xorganizations.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xorganizations.oss.grafana.net.namespaced
   name: organization-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XOrganization
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-OrganizationPreferences.yaml b/packages/grafana-namespaced-oss/Composition-OrganizationPreferences.yaml
index 18049b2..816f8df 100644
--- a/packages/grafana-namespaced-oss/Composition-OrganizationPreferences.yaml
+++ b/packages/grafana-namespaced-oss/Composition-OrganizationPreferences.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xorganizationpreferences.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xorganizationpreferences.oss.grafana.net.namespaced
   name: organizationpreferences-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XOrganizationPreferences
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-Playlist.yaml b/packages/grafana-namespaced-oss/Composition-Playlist.yaml
index 60b7e96..55d7dc4 100644
--- a/packages/grafana-namespaced-oss/Composition-Playlist.yaml
+++ b/packages/grafana-namespaced-oss/Composition-Playlist.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xplaylists.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xplaylists.oss.grafana.net.namespaced
   name: playlist-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XPlaylist
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-ServiceAccount.yaml b/packages/grafana-namespaced-oss/Composition-ServiceAccount.yaml
index 6fad55e..e50a609 100644
--- a/packages/grafana-namespaced-oss/Composition-ServiceAccount.yaml
+++ b/packages/grafana-namespaced-oss/Composition-ServiceAccount.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xserviceaccounts.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xserviceaccounts.oss.grafana.net.namespaced
   name: serviceaccount-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XServiceAccount
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-ServiceAccountPermission.yaml b/packages/grafana-namespaced-oss/Composition-ServiceAccountPermission.yaml
index 00b1e9b..04c1f49 100644
--- a/packages/grafana-namespaced-oss/Composition-ServiceAccountPermission.yaml
+++ b/packages/grafana-namespaced-oss/Composition-ServiceAccountPermission.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xserviceaccountpermissions.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xserviceaccountpermissions.oss.grafana.net.namespaced
   name: serviceaccountpermission-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XServiceAccountPermission
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-ServiceAccountToken.yaml b/packages/grafana-namespaced-oss/Composition-ServiceAccountToken.yaml
index d96f0c8..7713deb 100644
--- a/packages/grafana-namespaced-oss/Composition-ServiceAccountToken.yaml
+++ b/packages/grafana-namespaced-oss/Composition-ServiceAccountToken.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xserviceaccounttokens.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xserviceaccounttokens.oss.grafana.net.namespaced
   name: serviceaccounttoken-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XServiceAccountToken
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-SsoSettings.yaml b/packages/grafana-namespaced-oss/Composition-SsoSettings.yaml
index a957b13..427e7fd 100644
--- a/packages/grafana-namespaced-oss/Composition-SsoSettings.yaml
+++ b/packages/grafana-namespaced-oss/Composition-SsoSettings.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xssosettings.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xssosettings.oss.grafana.net.namespaced
   name: ssosettings-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XSsoSettings
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-Team.yaml b/packages/grafana-namespaced-oss/Composition-Team.yaml
index d7e71ef..1c0c3da 100644
--- a/packages/grafana-namespaced-oss/Composition-Team.yaml
+++ b/packages/grafana-namespaced-oss/Composition-Team.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xteams.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xteams.oss.grafana.net.namespaced
   name: team-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XTeam
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-oss/Composition-User.yaml b/packages/grafana-namespaced-oss/Composition-User.yaml
index 5e99c10..98a55f1 100644
--- a/packages/grafana-namespaced-oss/Composition-User.yaml
+++ b/packages/grafana-namespaced-oss/Composition-User.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xusers.oss.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xusers.oss.grafana.net.namespaced
   name: user-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: oss.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: oss.grafana.net.namespaced/v1alpha1
     kind: XUser
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-slo/CompositeResourceDefinition-SLO.yaml b/packages/grafana-namespaced-slo/CompositeResourceDefinition-SLO.yaml
index 46357a1..23e87c5 100644
--- a/packages/grafana-namespaced-slo/CompositeResourceDefinition-SLO.yaml
+++ b/packages/grafana-namespaced-slo/CompositeResourceDefinition-SLO.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xslos.slo.grafana.crossplane.io.namespaced
+  name: xslos.slo.grafana.net.namespaced
 spec:
   claimNames:
     kind: SLO
     plural: slos
   defaultCompositionRef:
     name: slo-namespaced
-  group: slo.grafana.crossplane.io.namespaced
+  group: slo.grafana.net.namespaced
   names:
     kind: XSLO
     plural: xslos
diff --git a/packages/grafana-namespaced-slo/Composition-SLO.yaml b/packages/grafana-namespaced-slo/Composition-SLO.yaml
index ca17908..d7c1341 100644
--- a/packages/grafana-namespaced-slo/Composition-SLO.yaml
+++ b/packages/grafana-namespaced-slo/Composition-SLO.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xslos.slo.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xslos.slo.grafana.net.namespaced
   name: slo-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: slo.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: slo.grafana.net.namespaced/v1alpha1
     kind: XSLO
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-sm/CompositeResourceDefinition-Check.yaml b/packages/grafana-namespaced-sm/CompositeResourceDefinition-Check.yaml
index 813c4d1..b5f8ac6 100644
--- a/packages/grafana-namespaced-sm/CompositeResourceDefinition-Check.yaml
+++ b/packages/grafana-namespaced-sm/CompositeResourceDefinition-Check.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xchecks.sm.grafana.crossplane.io.namespaced
+  name: xchecks.sm.grafana.net.namespaced
 spec:
   claimNames:
     kind: Check
     plural: checks
   defaultCompositionRef:
     name: check-namespaced
-  group: sm.grafana.crossplane.io.namespaced
+  group: sm.grafana.net.namespaced
   names:
     kind: XCheck
     plural: xchecks
diff --git a/packages/grafana-namespaced-sm/CompositeResourceDefinition-Installation.yaml b/packages/grafana-namespaced-sm/CompositeResourceDefinition-Installation.yaml
index d722614..af4aa2f 100644
--- a/packages/grafana-namespaced-sm/CompositeResourceDefinition-Installation.yaml
+++ b/packages/grafana-namespaced-sm/CompositeResourceDefinition-Installation.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xinstallations.sm.grafana.crossplane.io.namespaced
+  name: xinstallations.sm.grafana.net.namespaced
 spec:
   claimNames:
     kind: Installation
     plural: installations
   defaultCompositionRef:
     name: installation-namespaced
-  group: sm.grafana.crossplane.io.namespaced
+  group: sm.grafana.net.namespaced
   names:
     kind: XInstallation
     plural: xinstallations
diff --git a/packages/grafana-namespaced-sm/CompositeResourceDefinition-Probe.yaml b/packages/grafana-namespaced-sm/CompositeResourceDefinition-Probe.yaml
index fd7200b..1335907 100644
--- a/packages/grafana-namespaced-sm/CompositeResourceDefinition-Probe.yaml
+++ b/packages/grafana-namespaced-sm/CompositeResourceDefinition-Probe.yaml
@@ -3,14 +3,14 @@ kind: CompositeResourceDefinition
 metadata:
   annotations:
     tanka.dev/namespaced: "false"
-  name: xprobes.sm.grafana.crossplane.io.namespaced
+  name: xprobes.sm.grafana.net.namespaced
 spec:
   claimNames:
     kind: Probe
     plural: probes
   defaultCompositionRef:
     name: probe-namespaced
-  group: sm.grafana.crossplane.io.namespaced
+  group: sm.grafana.net.namespaced
   names:
     kind: XProbe
     plural: xprobes
diff --git a/packages/grafana-namespaced-sm/Composition-Check.yaml b/packages/grafana-namespaced-sm/Composition-Check.yaml
index 5283145..ff8af06 100644
--- a/packages/grafana-namespaced-sm/Composition-Check.yaml
+++ b/packages/grafana-namespaced-sm/Composition-Check.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xchecks.sm.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xchecks.sm.grafana.net.namespaced
   name: check-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: sm.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: sm.grafana.net.namespaced/v1alpha1
     kind: XCheck
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-sm/Composition-Installation.yaml b/packages/grafana-namespaced-sm/Composition-Installation.yaml
index 4f3b302..3f5679d 100644
--- a/packages/grafana-namespaced-sm/Composition-Installation.yaml
+++ b/packages/grafana-namespaced-sm/Composition-Installation.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xinstallations.sm.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xinstallations.sm.grafana.net.namespaced
   name: installation-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: sm.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: sm.grafana.net.namespaced/v1alpha1
     kind: XInstallation
   mode: Pipeline
   pipeline:
diff --git a/packages/grafana-namespaced-sm/Composition-Probe.yaml b/packages/grafana-namespaced-sm/Composition-Probe.yaml
index b931526..9ef88f9 100644
--- a/packages/grafana-namespaced-sm/Composition-Probe.yaml
+++ b/packages/grafana-namespaced-sm/Composition-Probe.yaml
@@ -4,11 +4,11 @@ metadata:
   annotations:
     tanka.dev/namespaced: "false"
   labels:
-    crossplane.io/xrd: xprobes.sm.grafana.crossplane.io.namespaced
+    crossplane.io/xrd: xprobes.sm.grafana.net.namespaced
   name: probe-namespaced
 spec:
   compositeTypeRef:
-    apiVersion: sm.grafana.crossplane.io.namespaced/v1alpha1
+    apiVersion: sm.grafana.net.namespaced/v1alpha1
     kind: XProbe
   mode: Pipeline
   pipeline: