diff --git a/config/schema/search_api.index.schema.yml b/config/schema/search_api.index.schema.yml
index 1315beb..224021b 100644
--- a/config/schema/search_api.index.schema.yml
+++ b/config/schema/search_api.index.schema.yml
@@ -1,5 +1,5 @@
 search_api.index.*:
-  type: mapping
+  type: config_entity
   label : 'Search index'
   mapping:
     id:
diff --git a/config/schema/search_api.server.schema.yml b/config/schema/search_api.server.schema.yml
index d1e93b3..5ff1a07 100644
--- a/config/schema/search_api.server.schema.yml
+++ b/config/schema/search_api.server.schema.yml
@@ -1,5 +1,5 @@
 search_api.server.*:
-  type: mapping
+  type: config_entity
   label : 'Search server'
   mapping:
     id:
diff --git a/src/Entity/Index.php b/src/Entity/Index.php
index a398dab..d26cfcc 100644
--- a/src/Entity/Index.php
+++ b/src/Entity/Index.php
@@ -53,6 +53,22 @@ use Drupal\search_api\Utility;
  *     "uuid" = "uuid",
  *     "status" = "status"
  *   },
+ *   config_export = {
+ *     "id",
+ *     "name",
+ *     "uuid",
+ *     "description",
+ *     "read_only",
+ *     "options",
+ *     "datasources",
+ *     "datasource_configs",
+ *     "tracker",
+ *     "tracker_config",
+ *     "server",
+ *     "status",
+ *     "langcode",
+ *     "dependencies",
+ *   },
  *   links = {
  *     "canonical" = "/admin/config/search/search-api/index/{search_api_index}",
  *     "add-form" = "/admin/config/search/search-api/add-index",
diff --git a/src/Entity/Server.php b/src/Entity/Server.php
index 4975efa..0a0711b 100644
--- a/src/Entity/Server.php
+++ b/src/Entity/Server.php
@@ -40,6 +40,17 @@ use Drupal\search_api\Utility;
  *     "uuid" = "uuid",
  *     "status" = "status"
  *   },
+ *   config_export = {
+ *     "id",
+ *     "name",
+ *     "uuid",
+ *     "description",
+ *     "status",
+ *     "backend",
+ *     "backend_config",
+ *     "langcode",
+ *     "dependencies",
+ *   },
  *   links = {
  *     "canonical" = "/admin/config/search/search-api/index/{search_api_server}",
  *     "add-form" = "/admin/config/search/search-api/add-server",