diff --git a/src/registry/metadataRegistry.json b/src/registry/metadataRegistry.json
index a7cffa515e..aef83748ae 100644
--- a/src/registry/metadataRegistry.json
+++ b/src/registry/metadataRegistry.json
@@ -284,6 +284,8 @@
     "function": "functionreference",
     "fundraisingConfig": "fundraisingconfig",
     "gatewayProviderPaymentMethodType": "gatewayproviderpaymentmethodtype",
+    "genAiFunction": "genaifunction",
+    "genAiPlanner": "genaiplanner",
     "genAiPromptTemplate": "genaiprompttemplate",
     "genAiPromptTemplateActivation": "genaiprompttemplateactv",
     "geodata": "eclairgeodata",
@@ -2582,6 +2584,20 @@
       "strictDirectoryName": false,
       "suffix": "gatewayProviderPaymentMethodType"
     },
+    "genaifunction": {
+      "directoryName": "genAiFunction",
+      "id": "genaifunction",
+      "inFolder": false,
+      "name": "GenAiFunction",
+      "suffix": "genAiFunction"
+    },
+    "genaiplanner": {
+      "directoryName": "genAiPlanner",
+      "id": "genaiplanner",
+      "inFolder": false,
+      "name": "GenAiPlanner",
+      "suffix": "genAiPlanner"
+    },
     "genaiprompttemplate": {
       "directoryName": "genAiPromptTemplates",
       "id": "genaiprompttemplate",
diff --git a/src/registry/nonSupportedTypes.ts b/src/registry/nonSupportedTypes.ts
index 94ae10a23f..3272e91e53 100644
--- a/src/registry/nonSupportedTypes.ts
+++ b/src/registry/nonSupportedTypes.ts
@@ -36,7 +36,6 @@ export const features = [
   'FUNDRAISING',
   'PARDOTADVANCED', // org:create throws a C-9999 when this is not excluded
   'EXTERNALCONNECTIVITY', // for type ExternalAuthIdentityProvider.  might work if it were added to a dev hub
-  'COPILOT', // responds with [Error] EinsteinCopilot : There was an error enabling or disabling a setting \n'
 ];
 
 export const settings = [