diff --git a/packages/kbn-es-archiver/src/actions/load.ts b/packages/kbn-es-archiver/src/actions/load.ts
index 87a844b2631230..58cacd399203dd 100644
--- a/packages/kbn-es-archiver/src/actions/load.ts
+++ b/packages/kbn-es-archiver/src/actions/load.ts
@@ -85,15 +85,17 @@ export async function loadAction({
   progress.deactivate();
   const result = stats.toJSON();
 
+  const indicesWithDocs: string[] = [];
   for (const [index, { docs }] of Object.entries(result)) {
     if (docs && docs.indexed > 0) {
       log.info('[%s] Indexed %d docs into %j', name, docs.indexed, index);
+      indicesWithDocs.push(index);
     }
   }
 
   await client.indices.refresh(
     {
-      index: '_all',
+      index: indicesWithDocs.join(','),
       allow_no_indices: true,
     },
     {
diff --git a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
index c57d5fb27cadbe..850f014e250b2f 100644
--- a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
@@ -158,7 +158,6 @@ export async function createDefaultSpace({
   await client.create(
     {
       index,
-      type: '_doc',
       id: 'space:default',
       refresh: 'wait_for',
       body: {
diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/mappings.json b/test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/mappings.json
index 935edfc332c010..748fb1cb3477a3 100644
--- a/test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/mappings.json
+++ b/test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/mappings.json
@@ -165,8 +165,7 @@
         "map": {
           "properties": {
             "bounds": {
-              "type": "geo_shape",
-              "tree": "quadtree"
+              "type": "geo_shape"
             },
             "description": {
               "type": "text"
@@ -418,4 +417,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/hidden_types/mappings.json b/test/functional/fixtures/es_archiver/saved_objects_management/hidden_types/mappings.json
index 4c0b802ef55b2d..520f73f8409bd9 100644
--- a/test/functional/fixtures/es_archiver/saved_objects_management/hidden_types/mappings.json
+++ b/test/functional/fixtures/es_archiver/saved_objects_management/hidden_types/mappings.json
@@ -196,8 +196,7 @@
         "map": {
           "properties": {
             "bounds": {
-              "type": "geo_shape",
-              "tree": "quadtree"
+              "type": "geo_shape"
             },
             "description": {
               "type": "text"
diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/show_relationships/mappings.json b/test/functional/fixtures/es_archiver/saved_objects_management/show_relationships/mappings.json
index e492dd5fa55c77..c2589d3ece5599 100644
--- a/test/functional/fixtures/es_archiver/saved_objects_management/show_relationships/mappings.json
+++ b/test/functional/fixtures/es_archiver/saved_objects_management/show_relationships/mappings.json
@@ -179,8 +179,7 @@
         "map": {
           "properties": {
             "bounds": {
-              "type": "geo_shape",
-              "tree": "quadtree"
+              "type": "geo_shape"
             },
             "description": {
               "type": "text"
diff --git a/x-pack/test/functional/es_archives/lens/basic/mappings.json b/x-pack/test/functional/es_archives/lens/basic/mappings.json
index 500da7c9c5a4e4..b595a4d1567d79 100644
--- a/x-pack/test/functional/es_archives/lens/basic/mappings.json
+++ b/x-pack/test/functional/es_archives/lens/basic/mappings.json
@@ -309,7 +309,6 @@
         "gis-map": {
           "properties": {
             "bounds": {
-              "strategy": "recursive",
               "type": "geo_shape"
             },
             "description": {
diff --git a/x-pack/test/functional/es_archives/lens/reporting/mappings.json b/x-pack/test/functional/es_archives/lens/reporting/mappings.json
index 69f9f063e4a63c..845d29b6a706bc 100644
--- a/x-pack/test/functional/es_archives/lens/reporting/mappings.json
+++ b/x-pack/test/functional/es_archives/lens/reporting/mappings.json
@@ -309,7 +309,6 @@
         "gis-map": {
           "properties": {
             "bounds": {
-              "strategy": "recursive",
               "type": "geo_shape"
             },
             "description": {
diff --git a/x-pack/test/functional/es_archives/lens/rollup/config/mappings.json b/x-pack/test/functional/es_archives/lens/rollup/config/mappings.json
index 500da7c9c5a4e4..b595a4d1567d79 100644
--- a/x-pack/test/functional/es_archives/lens/rollup/config/mappings.json
+++ b/x-pack/test/functional/es_archives/lens/rollup/config/mappings.json
@@ -309,7 +309,6 @@
         "gis-map": {
           "properties": {
             "bounds": {
-              "strategy": "recursive",
               "type": "geo_shape"
             },
             "description": {
diff --git a/x-pack/test/functional/es_archives/maps/kibana/mappings.json b/x-pack/test/functional/es_archives/maps/kibana/mappings.json
index 9095702e654e57..8ec850cde818aa 100644
--- a/x-pack/test/functional/es_archives/maps/kibana/mappings.json
+++ b/x-pack/test/functional/es_archives/maps/kibana/mappings.json
@@ -181,7 +181,6 @@
         "map": {
           "properties": {
             "bounds": {
-              "tree": "quadtree",
               "type": "geo_shape"
             },
             "description": {
diff --git a/x-pack/test/plugin_functional/es_archives/global_search/basic/mappings.json b/x-pack/test/plugin_functional/es_archives/global_search/basic/mappings.json
index 29817b58a3e0f1..f87503f7e25387 100644
--- a/x-pack/test/plugin_functional/es_archives/global_search/basic/mappings.json
+++ b/x-pack/test/plugin_functional/es_archives/global_search/basic/mappings.json
@@ -165,8 +165,7 @@
         "map": {
           "properties": {
             "bounds": {
-              "type": "geo_shape",
-              "tree": "quadtree"
+              "type": "geo_shape"
             },
             "description": {
               "type": "text"