diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index f5a0bd794e1..1c266190574 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -13,13 +13,13 @@ This serves two purposes:
 - for new features.
 
 ### Changed
-- for changes in existing functionality.
+- Changed how the documentation search is generated, to be an `InMemoryPage` instead of a post-build task.
 
 ### Deprecated
 - for soon-to-be removed features.
 
 ### Removed
-- for now removed features.
+- Breaking: Removed the build task `\Hyde\Framework\Actions\PostBuildTasks\GenerateSearch` (see upgrade guide below)
 
 ### Fixed
 - for any bug fixes.
@@ -30,3 +30,30 @@ This serves two purposes:
 ### Upgrade Guide
 
 If there are any breaking changes, include an upgrade guide here.
+
+#### Documentation search page changes
+
+The documentation search page and search index have been changed to be generated as `InMemoryPages` instead of a post-build task.
+
+The main impact noticeable to most users by this is the implicit changes, like the pages showing up in the dashboard and route list command.
+
+In case you have customized the `GenerateSearch` post-build task you may, depending on what you were trying to do, 
+want to adapt your code to interact with the new `InMemoryPage`, which is generated in the `HydeCoreExtension` class.
+
+For more information, see https://github.com/hydephp/develop/pull/1498.
+
+### Breaking changes
+
+#### Low impact
+
+- The `GenerateSearch` post-build task has been removed. If you have previously extended or customized this class, 
+  you will need to adapt your code, as the search index files are now handled implicitly during the standard build process,
+  as the search pages are now added to the kernel page and route collection. (https://github.com/hydephp/develop/pull/1498)
+
+- If your site has a custom documentation search page, for example `_docs/search.md` or `_pages/docs/search.blade.php`,
+  that page will no longer be built when using the specific `build:search` command. It will, of course, 
+  be built using the standard `build` command. https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced
+- 
+- In the highly unlikely event your site customizes any of the search pages by replacing them in the kernel route collection,
+  you would now need to do that in the kernel page collection due to the search pages being generated earlier in the lifecycle.
+  https://github.com/hydephp/develop/commit/82dc71f4a0e7b6be7a9f8d822fbebe39d2289ced
diff --git a/packages/framework/resources/views/components/docs/search-scripts.blade.php b/packages/framework/resources/views/components/docs/search-scripts.blade.php
index 0d381221c29..6da5968e532 100644
--- a/packages/framework/resources/views/components/docs/search-scripts.blade.php
+++ b/packages/framework/resources/views/components/docs/search-scripts.blade.php
@@ -1,7 +1,7 @@
 <script src="https://cdn.jsdelivr.net/npm/hydesearch@0.2.1/dist/HydeSearch.min.js" defer></script>
 <script>
     window.addEventListener('load', function () {
-        const searchIndexLocation = '{{ Hyde::relativeLink(ltrim(DocumentationPage::outputDirectory().'/search.json', '/')) }}';
+        const searchIndexLocation = '{{ Hyde::relativeLink(\Hyde\Framework\Features\Documentation\DocumentationSearchIndex::outputPath()) }}';
         const Search = new HydeSearch(searchIndexLocation);
 
         Search.init();
diff --git a/packages/framework/src/Console/Commands/BuildSearchCommand.php b/packages/framework/src/Console/Commands/BuildSearchCommand.php
index 03cf8f95934..4388c64cb68 100644
--- a/packages/framework/src/Console/Commands/BuildSearchCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSearchCommand.php
@@ -4,8 +4,11 @@
 
 namespace Hyde\Console\Commands;
 
-use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
+use Hyde\Foundation\Facades\Pages;
+use Hyde\Framework\Actions\StaticPageBuilder;
 use LaravelZero\Framework\Commands\Command;
+use Hyde\Framework\Features\Documentation\DocumentationSearchPage;
+use Hyde\Framework\Features\Documentation\DocumentationSearchIndex;
 
 /**
  * Run the build process for the documentation search index.
@@ -20,6 +23,12 @@ class BuildSearchCommand extends Command
 
     public function handle(): int
     {
-        return (new GenerateSearch())->run($this->output);
+        StaticPageBuilder::handle(Pages::get('docs/search.json') ?? new DocumentationSearchIndex());
+
+        if (DocumentationSearchPage::enabled()) {
+            StaticPageBuilder::handle(Pages::get('docs/search') ?? new DocumentationSearchPage());
+        }
+
+        return Command::SUCCESS;
     }
 }
diff --git a/packages/framework/src/Foundation/HydeCoreExtension.php b/packages/framework/src/Foundation/HydeCoreExtension.php
index 6c48936a370..38772c55871 100644
--- a/packages/framework/src/Foundation/HydeCoreExtension.php
+++ b/packages/framework/src/Foundation/HydeCoreExtension.php
@@ -9,8 +9,11 @@
 use Hyde\Pages\MarkdownPage;
 use Hyde\Pages\MarkdownPost;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Foundation\Kernel\PageCollection;
 use Hyde\Foundation\Concerns\HydeExtension;
 use Hyde\Facades\Features;
+use Hyde\Framework\Features\Documentation\DocumentationSearchPage;
+use Hyde\Framework\Features\Documentation\DocumentationSearchIndex;
 
 use function array_filter;
 use function array_keys;
@@ -28,4 +31,15 @@ public static function getPageClasses(): array
             DocumentationPage::class => Features::hasDocumentationPages(),
         ], fn (bool $value): bool => $value));
     }
+
+    public function discoverPages(PageCollection $collection): void
+    {
+        if (Features::hasDocumentationSearch()) {
+            $collection->addPage(new DocumentationSearchIndex());
+
+            if (DocumentationSearchPage::enabled()) {
+                $collection->addPage(new DocumentationSearchPage());
+            }
+        }
+    }
 }
diff --git a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
index 1e0948e47cf..7cd75691d9d 100644
--- a/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
+++ b/packages/framework/src/Framework/Actions/GeneratesDocumentationSearchIndex.php
@@ -4,9 +4,7 @@
 
 namespace Hyde\Framework\Actions;
 
-use Hyde\Hyde;
 use Hyde\Facades\Config;
-use Hyde\Facades\Filesystem;
 use Hyde\Framework\Concerns\InteractsWithDirectories;
 use Hyde\Pages\DocumentationPage;
 use Illuminate\Support\Collection;
@@ -16,17 +14,16 @@
 use function trim;
 
 /**
- * @internal Generate a JSON file that can be used as a search index for documentation pages.
+ * @internal Generate a JSON string that can be used as a search index for documentation pages.
  */
 class GeneratesDocumentationSearchIndex
 {
     use InteractsWithDirectories;
 
     protected Collection $index;
-    protected string $path;
 
     /**
-     * Generate the search index and save it to disk.
+     * @since v2.x This method returns the JSON string instead of saving it to disk and returning the path.
      *
      * @return string The path to the generated file.
      */
@@ -34,21 +31,19 @@ public static function handle(): string
     {
         $service = new static();
         $service->run();
-        $service->save();
 
-        return $service->path;
+        return $service->index->toJson();
     }
 
     protected function __construct()
     {
         $this->index = new Collection();
-        $this->path = $this->getPath();
     }
 
     protected function run(): void
     {
         DocumentationPage::all()->each(function (DocumentationPage $page): void {
-            if (! in_array($page->identifier, Config::getArray('docs.exclude_from_search', []))) {
+            if (! in_array($page->identifier, $this->getPagesToExcludeFromSearch())) {
                 $this->index->push($this->generatePageEntry($page));
             }
         });
@@ -67,13 +62,6 @@ protected function generatePageEntry(DocumentationPage $page): array
         ];
     }
 
-    protected function save(): void
-    {
-        $this->needsParentDirectory($this->path);
-
-        Filesystem::putContents($this->path, $this->index->toJson());
-    }
-
     protected function getSearchContentForDocument(DocumentationPage $page): string
     {
         return (new ConvertsMarkdownToPlainText($page->markdown->body()))->execute();
@@ -88,8 +76,10 @@ protected function formatDestination(string $slug): string
         return "$slug.html";
     }
 
-    protected function getPath(): string
+    protected function getPagesToExcludeFromSearch(): array
     {
-        return Hyde::sitePath(DocumentationPage::outputDirectory().'/search.json');
+        return array_merge(Config::getArray('docs.exclude_from_search', []),
+            Config::getBool('docs.create_search_page', true) ? ['search'] : []
+        );
     }
 }
diff --git a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php b/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
deleted file mode 100644
index 991190ff4b2..00000000000
--- a/packages/framework/src/Framework/Actions/PostBuildTasks/GenerateSearch.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Hyde\Framework\Actions\PostBuildTasks;
-
-use Hyde\Framework\Concerns\InteractsWithDirectories;
-use Hyde\Framework\Features\BuildTasks\PostBuildTask;
-use Hyde\Framework\Features\Documentation\DocumentationSearchPage;
-use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
-
-class GenerateSearch extends PostBuildTask
-{
-    use InteractsWithDirectories;
-
-    public static string $message = 'Generating search index';
-
-    protected string $path;
-
-    public function handle(): void
-    {
-        $this->path = GeneratesDocumentationSearchIndex::handle();
-
-        if (DocumentationSearchPage::enabled()) {
-            $this->createdSiteFile(DocumentationSearchPage::generate());
-        }
-    }
-
-    public function printFinishMessage(): void
-    {
-        $this->createdSiteFile($this->path)->withExecutionTime();
-    }
-}
diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
new file mode 100644
index 00000000000..ac14115b422
--- /dev/null
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchIndex.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Documentation;
+
+use Hyde\Pages\InMemoryPage;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Support\Models\RouteKey;
+use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
+
+/**
+ * @internal This page is used to render the search index for the documentation.
+ */
+class DocumentationSearchIndex extends InMemoryPage
+{
+    /**
+     * Create a new DocumentationSearchPage instance.
+     */
+    public function __construct()
+    {
+        parent::__construct(DocumentationSearchIndex::outputPath(), [
+            'navigation' => ['hidden' => true],
+        ]);
+    }
+
+    public function compile(): string
+    {
+        return GeneratesDocumentationSearchIndex::handle();
+    }
+
+    public static function outputPath(string $identifier = ''): string
+    {
+        return RouteKey::fromPage(DocumentationPage::class, 'search').'.json';
+    }
+}
diff --git a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
index 4563eb45337..7db4a83ca97 100644
--- a/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
+++ b/packages/framework/src/Framework/Features/Documentation/DocumentationSearchPage.php
@@ -5,10 +5,12 @@
 namespace Hyde\Framework\Features\Documentation;
 
 use Hyde\Hyde;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\DocumentationPage;
+use Hyde\Pages\Concerns\HydePage;
+use Hyde\Support\Models\RouteKey;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\Facades\Config;
-use Illuminate\Support\Facades\View;
 
 /**
  * @internal This page is used to render the search page for the documentation.
@@ -17,7 +19,7 @@
  * If you want to override this page, you can create a page with the route key "docs/search",
  * then this class will not be applied. For example, `_pages/docs/search.blade.php`.
  */
-class DocumentationSearchPage extends DocumentationPage
+class DocumentationSearchPage extends InMemoryPage
 {
     /**
      * Generate the search page and save it to disk.
@@ -34,23 +36,33 @@ public static function generate(): string
      */
     public function __construct()
     {
-        parent::__construct('search', [
+        parent::__construct(static::routeKey(), [
             'title' => 'Search',
-        ]);
+            'navigation' => ['hidden' => true],
+            'article' => $this->makeArticle(),
+        ], view: 'hyde::pages.documentation-search');
     }
 
-    public function compile(): string
+    public static function enabled(): bool
     {
-        return View::make('hyde::pages.documentation-search')->render();
+        return Config::getBool('docs.create_search_page', true) && ! static::anotherSearchPageExists();
     }
 
-    public static function enabled(): bool
+    public static function routeKey(): string
     {
-        return Config::getBool('docs.create_search_page', true) && ! Hyde::routes()->has(self::routeKey());
+        return RouteKey::fromPage(DocumentationPage::class, 'search')->get();
     }
 
-    public static function routeKey(): string
+    protected static function anotherSearchPageExists(): bool
+    {
+        // Since routes aren't discovered yet due to this page being added in the core extension,
+        // we need to check the page collection directly, instead of the route collection.
+        return Hyde::pages()->first(fn (HydePage $file): bool => $file->getRouteKey() === static::routeKey()) !== null;
+    }
+
+    /** @experimental Fixes type issue {@see https://github.com/hydephp/develop/commit/37f7046251b8c0514b8d8ef821de4ef3d35bbac8#commitcomment-135026537} */
+    protected function makeArticle(): SemanticDocumentationArticle
     {
-        return parent::outputDirectory().'/search';
+        return SemanticDocumentationArticle::make(new DocumentationPage());
     }
 }
diff --git a/packages/framework/src/Framework/Services/BuildTaskService.php b/packages/framework/src/Framework/Services/BuildTaskService.php
index a976526e214..d2eb432a015 100644
--- a/packages/framework/src/Framework/Services/BuildTaskService.php
+++ b/packages/framework/src/Framework/Services/BuildTaskService.php
@@ -11,7 +11,6 @@
 use Hyde\Framework\Features\BuildTasks\PreBuildTask;
 use Hyde\Framework\Features\BuildTasks\PostBuildTask;
 use Hyde\Framework\Actions\PreBuildTasks\CleanSiteDirectory;
-use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
@@ -136,7 +135,6 @@ private function registerFrameworkTasks(): void
         $this->registerIf(GenerateBuildManifest::class, $this->canGenerateManifest());
         $this->registerIf(GenerateSitemap::class, $this->canGenerateSitemap());
         $this->registerIf(GenerateRssFeed::class, $this->canGenerateFeed());
-        $this->registerIf(GenerateSearch::class, $this->canGenerateSearch());
     }
 
     private function canCleanSiteDirectory(): bool
@@ -158,9 +156,4 @@ private function canGenerateFeed(): bool
     {
         return Features::rss();
     }
-
-    private function canGenerateSearch(): bool
-    {
-        return Features::hasDocumentationSearch();
-    }
 }
diff --git a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
index d8dc55a2826..6accb4a1370 100644
--- a/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSearchCommandTest.php
@@ -6,13 +6,15 @@
 
 use Hyde\Facades\Filesystem;
 use Hyde\Hyde;
+use Hyde\Pages\InMemoryPage;
 use Hyde\Pages\DocumentationPage;
 use Hyde\Testing\TestCase;
+use Hyde\Framework\Features\Documentation\DocumentationSearchIndex;
 
 /**
  * @covers \Hyde\Console\Commands\BuildSearchCommand
- * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
  * @covers \Hyde\Framework\Features\Documentation\DocumentationSearchPage
+ * @covers \Hyde\Framework\Features\Documentation\DocumentationSearchIndex
  */
 class BuildSearchCommandTest extends TestCase
 {
@@ -103,4 +105,34 @@ public function test_search_files_can_be_generated_for_custom_site_and_nested_do
 
         Filesystem::deleteDirectory('foo');
     }
+
+    public function test_command_uses_search_pages_from_kernel_when_present()
+    {
+        Hyde::pages()->addPage(new SearchIndexOverrideTestPage());
+
+        Hyde::pages()->addPage(tap(new InMemoryPage('docs/search'), function (InMemoryPage $page): void {
+            $page->macro('compile', fn () => 'Foo');
+        }));
+
+        $this->artisan('build:search')->assertExitCode(0);
+
+        $this->assertFileExists(Hyde::path('_site/docs/search.json'));
+
+        $this->assertSame('{"foo":"bar"}', Filesystem::getContents('_site/docs/search.json'));
+
+        Filesystem::unlink('_site/docs/search.json');
+    }
+}
+
+class SearchIndexOverrideTestPage extends DocumentationSearchIndex
+{
+    public function compile(): string
+    {
+        return '{"foo":"bar"}';
+    }
+
+    public function getOutputPath(): string
+    {
+        return 'docs/search.json';
+    }
 }
diff --git a/packages/framework/tests/Feature/DocumentationSearchIndexTest.php b/packages/framework/tests/Feature/DocumentationSearchIndexTest.php
new file mode 100644
index 00000000000..7cc9b8939d7
--- /dev/null
+++ b/packages/framework/tests/Feature/DocumentationSearchIndexTest.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Feature;
+
+use Hyde\Testing\TestCase;
+use Hyde\Pages\DocumentationPage;
+use Hyde\Framework\Features\Documentation\DocumentationSearchIndex;
+
+/**
+ * @covers \Hyde\Framework\Features\Documentation\DocumentationSearchIndex
+ *
+ * @see \Hyde\Framework\Testing\Feature\Commands\BuildSearchCommandTest
+ */
+class DocumentationSearchIndexTest extends TestCase
+{
+    public function testCanCreateDocumentationSearchIndexInstance()
+    {
+        $this->assertInstanceOf(DocumentationSearchIndex::class, new DocumentationSearchIndex());
+    }
+
+    public function testRouteKeyIsSetToDocumentationOutputDirectory()
+    {
+        $page = new DocumentationSearchIndex();
+        $this->assertSame('docs/search.json', $page->routeKey);
+    }
+
+    public function testRouteKeyIsSetToConfiguredDocumentationOutputDirectory()
+    {
+        DocumentationPage::setOutputDirectory('foo');
+
+        $page = new DocumentationSearchIndex();
+        $this->assertSame('foo/search.json', $page->routeKey);
+    }
+
+    public function testStaticOutputPathHelper()
+    {
+        $this->assertSame('docs/search.json', DocumentationSearchIndex::outputPath());
+    }
+
+    public function testStaticOutputPathHelperWithCustomOutputDirectory()
+    {
+        DocumentationPage::setOutputDirectory('foo');
+        $this->assertSame('foo/search.json', DocumentationSearchIndex::outputPath());
+    }
+
+    public function testStaticOutputPathHelperWithRootOutputDirectory()
+    {
+        DocumentationPage::setOutputDirectory('');
+        $this->assertSame('search.json', DocumentationSearchIndex::outputPath());
+    }
+}
diff --git a/packages/framework/tests/Feature/DocumentationSearchPageTest.php b/packages/framework/tests/Feature/DocumentationSearchPageTest.php
index 22a9b53ed1c..e7a2adc4dc3 100644
--- a/packages/framework/tests/Feature/DocumentationSearchPageTest.php
+++ b/packages/framework/tests/Feature/DocumentationSearchPageTest.php
@@ -49,14 +49,14 @@ public function testEnabledIsFalseWhenDisabled()
 
     public function testEnabledIsFalseWhenRouteExists()
     {
-        Hyde::routes()->put('docs/search', new InMemoryPage('docs/search'));
+        Hyde::pages()->put('docs/search', new InMemoryPage('docs/search'));
         $this->assertFalse(DocumentationSearchPage::enabled());
     }
 
     public function testEnabledIsFalseWhenDisabledAndRouteExists()
     {
         config(['docs.create_search_page' => false]);
-        Hyde::routes()->put('docs/search', new InMemoryPage('docs/search'));
+        Hyde::pages()->put('docs/search', new InMemoryPage('docs/search'));
         $this->assertFalse(DocumentationSearchPage::enabled());
     }
 
@@ -70,4 +70,10 @@ public function testStaticRouteKeyHelperWithCustomOutputDirectory()
         DocumentationPage::setOutputDirectory('foo');
         $this->assertSame('foo/search', DocumentationSearchPage::routeKey());
     }
+
+    public function testStaticRouteKeyHelperWithRootOutputDirectory()
+    {
+        DocumentationPage::setOutputDirectory('');
+        $this->assertSame('search', DocumentationSearchPage::routeKey());
+    }
 }
diff --git a/packages/framework/tests/Feature/PageCollectionTest.php b/packages/framework/tests/Feature/PageCollectionTest.php
index 19a961b761d..f055ae3bf24 100644
--- a/packages/framework/tests/Feature/PageCollectionTest.php
+++ b/packages/framework/tests/Feature/PageCollectionTest.php
@@ -80,6 +80,7 @@ public function test_get_page_returns_parsed_page_object_for_given_source_path()
     public function test_get_pages_returns_collection_of_pages_of_given_class()
     {
         $this->withoutDefaultPages();
+        $this->withoutDocumentationSearch();
 
         $this->file('_pages/foo.blade.php');
         $this->file('_pages/foo.md');
@@ -103,11 +104,13 @@ public function test_get_pages_returns_collection_of_pages_of_given_class()
         $this->assertEquals(new HtmlPage('foo'), Pages::getPages(HtmlPage::class)->first());
 
         $this->restoreDefaultPages();
+        $this->restoreDocumentationSearch();
     }
 
     public function test_get_pages_returns_all_pages_when_not_supplied_with_class_string()
     {
         $this->withoutDefaultPages();
+        $this->withoutDocumentationSearch();
 
         $this->file('_pages/foo.blade.php');
         $this->file('_pages/foo.md');
@@ -125,13 +128,16 @@ public function test_get_pages_returns_all_pages_when_not_supplied_with_class_st
         $this->assertEquals(new HtmlPage('foo'), $collection->get('_pages/foo.html'));
 
         $this->restoreDefaultPages();
+        $this->restoreDocumentationSearch();
     }
 
     public function test_get_pages_returns_empty_collection_when_no_pages_are_discovered()
     {
         $this->withoutDefaultPages();
+        $this->withoutDocumentationSearch();
         $this->assertEmpty(Pages::getPages());
         $this->restoreDefaultPages();
+        $this->restoreDocumentationSearch();
     }
 
     public function test_pages_are_not_discovered_for_disabled_features()
@@ -155,6 +161,8 @@ public function test_pages_are_not_discovered_for_disabled_features()
 
     public function test_pages_with_custom_source_directories_are_discovered_properly()
     {
+        $this->withoutDocumentationSearch();
+
         BladePage::setSourceDirectory('.source/pages');
         MarkdownPage::setSourceDirectory('.source/pages');
         MarkdownPost::setSourceDirectory('.source/posts');
@@ -177,6 +185,8 @@ public function test_pages_with_custom_source_directories_are_discovered_properl
         $this->assertEquals(new MarkdownPage('foo'), $collection->get('.source/pages/foo.md'));
         $this->assertEquals(new MarkdownPost('foo'), $collection->get('.source/posts/foo.md'));
         $this->assertEquals(new DocumentationPage('foo'), $collection->get('.source/docs/foo.md'));
+
+        $this->restoreDocumentationSearch();
     }
 
     public function test_get_file_throws_exception_when_file_is_not_found()
diff --git a/packages/framework/tests/Feature/RouteCollectionTest.php b/packages/framework/tests/Feature/RouteCollectionTest.php
index 383ef835a47..e1b8c74a0dd 100644
--- a/packages/framework/tests/Feature/RouteCollectionTest.php
+++ b/packages/framework/tests/Feature/RouteCollectionTest.php
@@ -40,6 +40,7 @@ public function test_boot_method_discovers_all_pages()
     public function test_boot_method_discovers_all_page_types()
     {
         $this->withoutDefaultPages();
+        $this->withoutDocumentationSearch();
 
         $this->file('_pages/blade.blade.php');
         $this->file('_pages/markdown.md');
@@ -61,6 +62,7 @@ public function test_boot_method_discovers_all_page_types()
         ], $collection->all());
 
         $this->restoreDefaultPages();
+        $this->restoreDocumentationSearch();
     }
 
     public function test_get_routes_returns_all_routes()
@@ -77,6 +79,7 @@ public function test_get_routes_returns_all_routes()
     public function test_get_routes_for_model_returns_collection_of_routes_of_given_class()
     {
         $this->withoutDefaultPages();
+        $this->withoutDocumentationSearch();
 
         $this->file('_pages/blade.blade.php');
         $this->file('_pages/markdown.md');
@@ -94,6 +97,7 @@ public function test_get_routes_for_model_returns_collection_of_routes_of_given_
         $this->assertEquals(new Route(new HtmlPage('html')), Routes::getRoutes(HtmlPage::class)->first());
 
         $this->restoreDefaultPages();
+        $this->restoreDocumentationSearch();
     }
 
     public function test_add_route_adds_new_route()
diff --git a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
index 0260d37a8f6..347f83530ca 100644
--- a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
+++ b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
@@ -19,7 +19,6 @@
  * @covers \Hyde\Framework\Features\BuildTasks\PostBuildTask
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap
  * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed
- * @covers \Hyde\Framework\Actions\PostBuildTasks\GenerateSearch
  *
  * @see \Hyde\Framework\Testing\Unit\BuildTaskServiceUnitTest
  */
diff --git a/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php b/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
index 0689b4665bb..f43165cdafa 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
@@ -4,7 +4,6 @@
 
 namespace Hyde\Framework\Testing\Feature\Services;
 
-use Hyde\Facades\Filesystem;
 use Hyde\Framework\Actions\GeneratesDocumentationSearchIndex;
 use Hyde\Hyde;
 use Hyde\Testing\CreatesTemporaryFiles;
@@ -32,14 +31,12 @@ public function test_it_generates_a_json_file_with_a_search_index()
     {
         $this->file('_docs/foo.md');
 
-        GeneratesDocumentationSearchIndex::handle();
-
         $this->assertSame(json_encode([[
             'slug' => 'foo',
             'title' => 'Foo',
             'content' => '',
             'destination' => 'foo.html',
-        ]]), file_get_contents('_site/docs/search.json'));
+        ]]), GeneratesDocumentationSearchIndex::handle());
     }
 
     public function test_it_adds_all_files_to_search_index()
@@ -53,20 +50,7 @@ public function test_it_adds_all_files_to_search_index()
 
     public function test_it_handles_generation_even_when_there_are_no_pages()
     {
-        GeneratesDocumentationSearchIndex::handle();
-
-        $this->assertSame('[]', file_get_contents('_site/docs/search.json'));
-
-        Filesystem::unlink('_site/docs/search.json');
-    }
-
-    public function test_save_method_saves_the_file_to_the_correct_location()
-    {
-        GeneratesDocumentationSearchIndex::handle();
-
-        $this->assertFileExists('_site/docs/search.json');
-
-        Filesystem::unlink('_site/docs/search.json');
+        $this->assertSame('[]', GeneratesDocumentationSearchIndex::handle());
     }
 
     public function test_it_generates_a_valid_JSON()
@@ -134,10 +118,6 @@ public function test_nested_source_files_do_not_retain_directory_name_in_search_
 
     protected function getArray(): array
     {
-        GeneratesDocumentationSearchIndex::handle();
-        $array = json_decode(file_get_contents('_site/docs/search.json'), true);
-        Filesystem::unlink('_site/docs/search.json');
-
-        return $array;
+        return json_decode(GeneratesDocumentationSearchIndex::handle(), true);
     }
 }
diff --git a/packages/framework/tests/Feature/Services/SitemapServiceTest.php b/packages/framework/tests/Feature/Services/SitemapServiceTest.php
index e82342eb974..0c735f08819 100644
--- a/packages/framework/tests/Feature/Services/SitemapServiceTest.php
+++ b/packages/framework/tests/Feature/Services/SitemapServiceTest.php
@@ -67,6 +67,7 @@ public function test_generate_adds_markdown_posts_to_xml()
 
     public function test_generate_adds_documentation_pages_to_xml()
     {
+        $this->withoutDocumentationSearch();
         Filesystem::touch('_docs/foo.md');
 
         $service = new SitemapGenerator();
@@ -74,6 +75,19 @@ public function test_generate_adds_documentation_pages_to_xml()
 
         $this->assertCount(3, $service->getXmlElement()->url);
 
+        Filesystem::unlink('_docs/foo.md');
+        $this->restoreDocumentationSearch();
+    }
+
+    public function test_generate_adds_documentation_search_pages_to_xml()
+    {
+        Filesystem::touch('_docs/foo.md');
+
+        $service = new SitemapGenerator();
+        $service->generate();
+
+        $this->assertCount(5, $service->getXmlElement()->url);
+
         Filesystem::unlink('_docs/foo.md');
     }
 
@@ -131,6 +145,7 @@ public function test_all_route_types_are_discovered()
     {
         config(['hyde.url' => 'foo']);
         Filesystem::unlink(['_pages/index.blade.php', '_pages/404.blade.php']);
+        $this->withoutDocumentationSearch();
 
         $files = [
             '_pages/blade.blade.php',
@@ -157,6 +172,8 @@ public function test_all_route_types_are_discovered()
 
         copy(Hyde::vendorPath('resources/views/homepages/welcome.blade.php'), Hyde::path('_pages/index.blade.php'));
         copy(Hyde::vendorPath('resources/views/pages/404.blade.php'), Hyde::path('_pages/404.blade.php'));
+
+        $this->restoreDocumentationSearch();
     }
 
     public function testLinksFallbackToRelativeLinksWhenASiteUrlIsNotSet()
diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index c4bc8d35dbf..165a11ad07b 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -83,7 +83,6 @@ public function test_all_page_types_can_be_compiled()
             ->expectsOutput('Creating Markdown Pages...')
             ->expectsOutput('Creating Markdown Posts...')
             ->expectsOutput('Creating Documentation Pages...')
-            ->doesntExpectOutputToContain('Creating')
             ->assertExitCode(0);
 
         $this->assertFileExists(Hyde::path('_site/html.html'));
diff --git a/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php b/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
index 1b08979d54f..bcf14ff42a2 100644
--- a/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
+++ b/packages/framework/tests/Unit/BuildTaskServiceUnitTest.php
@@ -8,7 +8,6 @@
 use Hyde\Foundation\Kernel\Filesystem;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateBuildManifest;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateRssFeed;
-use Hyde\Framework\Actions\PostBuildTasks\GenerateSearch;
 use Hyde\Framework\Actions\PostBuildTasks\GenerateSitemap as FrameworkGenerateSitemap;
 use Hyde\Framework\Features\BuildTasks\BuildTask;
 use Hyde\Framework\Features\BuildTasks\PostBuildTask;
@@ -167,11 +166,6 @@ public function testGenerateRssFeedExtendsPostBuildTask()
         $this->assertInstanceOf(PostBuildTask::class, new GenerateRssFeed());
     }
 
-    public function testGenerateSearchExtendsPostBuildTask()
-    {
-        $this->assertInstanceOf(PostBuildTask::class, new GenerateSearch());
-    }
-
     public function testGenerateSitemapExtendsPostBuildTask()
     {
         $this->assertInstanceOf(PostBuildTask::class, new FrameworkGenerateSitemap());
diff --git a/packages/framework/tests/Unit/Pages/PageModelGetHelperTest.php b/packages/framework/tests/Unit/Pages/PageModelGetHelperTest.php
index fea50135306..f8727b4caed 100644
--- a/packages/framework/tests/Unit/Pages/PageModelGetHelperTest.php
+++ b/packages/framework/tests/Unit/Pages/PageModelGetHelperTest.php
@@ -51,6 +51,8 @@ public function test_markdown_post_get_helper_returns_markdown_post_collection()
 
     public function test_documentation_page_get_helper_returns_documentation_page_collection()
     {
+        $this->withoutDocumentationSearch();
+
         Filesystem::touch('_docs/test-page.md');
 
         $collection = DocumentationPage::all();
@@ -59,5 +61,7 @@ public function test_documentation_page_get_helper_returns_documentation_page_co
         $this->assertContainsOnlyInstancesOf(DocumentationPage::class, $collection);
 
         Filesystem::unlink('_docs/test-page.md');
+
+        $this->restoreDocumentationSearch();
     }
 }
diff --git a/packages/realtime-compiler/src/Routing/PageRouter.php b/packages/realtime-compiler/src/Routing/PageRouter.php
index 1e41b531bd4..a3a3876203a 100644
--- a/packages/realtime-compiler/src/Routing/PageRouter.php
+++ b/packages/realtime-compiler/src/Routing/PageRouter.php
@@ -8,7 +8,6 @@
 use Hyde\Pages\Concerns\BaseMarkdownPage;
 use Hyde\Framework\Actions\StaticPageBuilder;
 use Hyde\RealtimeCompiler\Http\LiveEditController;
-use Hyde\Framework\Features\Documentation\DocumentationSearchPage;
 use Hyde\Pages\Concerns\HydePage;
 use Hyde\RealtimeCompiler\Concerns\InteractsWithLaravel;
 use Hyde\RealtimeCompiler\Concerns\SendsErrorResponses;
@@ -90,12 +89,6 @@ public static function handle(Request $request): Response
 
     protected function getPageFromRoute(): HydePage
     {
-        if (unslash($this->request->path) === DocumentationSearchPage::routeKey() && DocumentationSearchPage::enabled()) {
-            // Since this page is not present within the search index (as it's normally generated by a build task)
-            // we instantiate and return it here.
-            return new DocumentationSearchPage();
-        }
-
         return Routes::getOrFail($this->normalizePath($this->request->path))->getPage();
     }
 }
diff --git a/packages/realtime-compiler/tests/RealtimeCompilerTest.php b/packages/realtime-compiler/tests/RealtimeCompilerTest.php
index 9f48e9467a9..5c2cec606c3 100644
--- a/packages/realtime-compiler/tests/RealtimeCompilerTest.php
+++ b/packages/realtime-compiler/tests/RealtimeCompilerTest.php
@@ -164,6 +164,8 @@
 });
 
 test('docs/search renders search page', function () {
+    Filesystem::put('_docs/index.md', '# Hello World!');
+
     mockRoute('docs/search');
 
     $kernel = new HttpKernel();
@@ -175,6 +177,7 @@
 
     expect($response->body)->toContain('Search the documentation site');
 
+    Filesystem::unlink('_docs/index.md');
     Filesystem::unlink('_site/docs/search.html');
 });
 
diff --git a/packages/testing/src/ResetsApplication.php b/packages/testing/src/ResetsApplication.php
index f5db985f41f..96729828402 100644
--- a/packages/testing/src/ResetsApplication.php
+++ b/packages/testing/src/ResetsApplication.php
@@ -50,6 +50,28 @@ protected function restoreDefaultPages(): void
         copy(Hyde::vendorPath('resources/views/pages/404.blade.php'), Hyde::path('_pages/404.blade.php'));
     }
 
+    /** @experimental We may want to make this a part of {@see static::withoutDefaultPages()} */
+    protected function withoutDocumentationSearch(): void
+    {
+        $features = config('hyde.features');
+
+        $flipped = array_flip($features);
+        unset($flipped['documentation-search']);
+        $features = array_flip($flipped);
+
+        config(['hyde.features' => $features]);
+    }
+
+    /** @experimental We may want to make this a part of {@see static::restoreDefaultPages()} */
+    protected function restoreDocumentationSearch(): void
+    {
+        $features = config('hyde.features');
+
+        $features[] = 'documentation-search';
+
+        config(['hyde.features' => $features]);
+    }
+
     protected static function unlinkUnlessDefault(string $filepath): void
     {
         $protected = [