diff --git a/source/_static/css/homepage-v1.css b/source/_static/css/homepage-v1.css
index b6b317adcfa..ba2804e208c 100644
--- a/source/_static/css/homepage-v1.css
+++ b/source/_static/css/homepage-v1.css
@@ -104,7 +104,12 @@ body:not([data-custom-theme=light]) .site-header {
   color: #1C58D9;
 }
 
+.DocSearch-Container {
+  margin-top: 55px;
+}
+
 .sidebar-search {
+  display: none;
   border-radius: 4px;
   border: 1px solid rgba(63, 67, 80, 0.16);
   background: #FFF;
@@ -118,6 +123,7 @@ body:not([data-custom-theme=light]) .sidebar-search::selection {
 }
 
 .sidebar-search-container:before {
+  height: 0px;
   left: 32px;
   z-index: 20;
   background-color: currentColor;
diff --git a/source/_static/css/homepage-v1.css.map b/source/_static/css/homepage-v1.css.map
index 7f159a0db42..1fc4f00d9c0 100644
--- a/source/_static/css/homepage-v1.css.map
+++ b/source/_static/css/homepage-v1.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../scss/partials/_variables.scss","../scss/partials/_header.scss","../scss/partials/_sidebar.scss","../scss/partials/_blog.scss","../scss/partials/_mixins.scss","../scss/partials/_masthead.scss","../scss/partials/_thermometer.scss","../scss/partials/_badge.scss","../scss/homepage-v1.scss"],"names":[],"mappings":"AAAA;AAUA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AC5BE;EADJ;IAEQ;;;;AAIR;EACI;;AAEA;EACI;;;AAKJ;EACI;;AAGJ;EACI;;;AAIR;EACI;IACI;IACA;;;EAGJ;IACI;;;AAIR;EACI;IACI;IACA;;;EAGJ;IACI;;;AC1CR;EACI;EACA;;;AAGJ;AAEA;EACI;EACA;;AAEA;EACI;;;AAIR;EACI;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKJ;EACI;;AAIA;EACI;EACA;EACA;;AAGJ;EACI;;;AAKZ;EACI;EACA;EACA;;AAEA;EACI;;;AAMA;EACI;;;AAKZ;EACI;EACA;EACA;;;AAGJ;AAAA;EAEI;;;AAIA;EACI;;AAGJ;EACI;EACA;;AAGJ;AAAA;EAEI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;;;AAIR;EACI;IACI;IACA;;;EAGJ;IACI;IACA;;;ACtHR;AAAA;AAAA;AAAA;AAAA;AAAA;EAMI;EACA;;;AAGJ;AAAA;EAEI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAIR;EAEI;;AAEA;EACI;EACA;;AAEA;EACI;;AAKZ;EACI;;AAEA;EACI;EACA;;AAEA;EACI;;;AAMhB;EACI;EACA;;AAEA;EACI;;;AAIR;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;AAEA;EACI;;;AAKJ;EC7CA;;ADiDA;ECjDA;;ADqDA;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;AAAA;EAEI;EACA;;AAEA;AAAA;EACI;;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAIJ;AACI;EACA;;;AAGJ;EACI;;;AAIA;AACI;EACA;;AAGJ;EACI;;;AAKR;EACI;;;AEzNJ;EACI;EACA;EACA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;EACA;;AAEA;EACI;;;AAMhB;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;IACI;;;EAIA;IACI;;;AAMZ;EACI;EACA;;AAEA;EAJJ;IAKQ;;;;AAIR;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;AAEA;EANJ;IAOQ;;;AAGJ;EACI;;;AAIR;EACI;EACA;EACA;EACA;AACA;EACA;;;AAGJ;EACI;EACA;EACA;;AAEA;EACI;;AAGJ;EATJ;IAUQ;IACA;;;;AAKR;EACI;EACA;EACA;EACA;EACA;EACA;;AAGI;EACI;;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;;AAIR;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;;;AAOJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;;AAEA;EACI;;AAGJ;EACI;;AAIR;EACI;;AAEA;EACI;;;ACzLZ;AACA;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;AAAA;EAEI;EACA;;;AAGJ;AAEA;AACA;EACI;EACA;;;AAGJ;AAEA;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;;;AAIA;EACI;;AAGJ;EACI;EACA;;;AAIR;AAAA;AAAA;EAGI;;;AAGJ;AAEA;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKJ;AAEA;EACI;IACI;IACA;IACA;IACA;IACA;;;EAGJ;IACI;;;EAGJ;IACI;IACA;IACA;;;AC/QR;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;;AAKZ;EACI;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAEA;EHaJ;;;AGLI;EACI;;AAEA;EHER;;AGMQ;EACI;;;ACxDhB;EACI;EACA;;AAII;AAAA;AAAA;EAGI;;AAGJ;EACI;;AAIA;EADJ;IAEQ;;;AAIR;EACI;;AAGJ;EACI;;;AAKZ;AAAA;AAAA;EAGI;;;AAKA;EACI;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;;;AAKZ;EACI;;;AAIA;EACI;;AAEA;EACI;EACA;;;AAMR;EACI;;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;;AAIR;EACI;IACI;;;EAGJ;IACI;IACA;;;EAGJ;IACI;IACA;IACA;IACA;IACA;IACA;;;AAIR;EACI;EACA;;;AAKJ;EACI;EACA;EACA;EACA;EACA;AACA;EACA;;;AAKA;EACI","file":"homepage-v1.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../scss/partials/_variables.scss","../scss/partials/_header.scss","../scss/partials/_sidebar.scss","../scss/partials/_blog.scss","../scss/partials/_mixins.scss","../scss/partials/_masthead.scss","../scss/partials/_thermometer.scss","../scss/partials/_badge.scss","../scss/homepage-v1.scss"],"names":[],"mappings":"AAAA;AAUA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AC5BE;EADJ;IAEQ;;;;AAIR;EACI;;AAEA;EACI;;;AAKJ;EACI;;AAGJ;EACI;;;AAIR;EACI;IACI;IACA;;EAGJ;IACI;;;AAIR;EACI;IACI;IACA;;EAGJ;IACI;;;AC1CR;EACI;EACA;;;AAGJ;AAEA;EACI;EACA;;AAEA;EACI;;;AAIR;EACI;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKJ;EACI;;AAIA;EACI;EACA;EACA;;AAGJ;EACI;;;AAKZ;EACI;;;AAGJ;EACI;EAEA;EACA;EACA;;AAEA;EACI;;;AAMA;EACI;;;AAKZ;EACI;EACA;EACA;EACA;;;AAGJ;AAAA;EAEI;;;AAIA;EACI;;AAGJ;EACI;EACA;;AAGJ;AAAA;EAEI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;;;AAIR;EACI;IACI;IACA;;EAGJ;IACI;IACA;;;AC7HR;AAAA;AAAA;AAAA;AAAA;AAAA;EAMI;EACA;;;AAGJ;AAAA;EAEI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAIR;EAEI;;AAEA;EACI;EACA;;AAEA;EACI;;AAKZ;EACI;;AAEA;EACI;EACA;;AAEA;EACI;;;AAMhB;EACI;EACA;;AAEA;EACI;;;AAIR;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;AAEA;EACI;;;AAKJ;EC7CA;;ADiDA;ECjDA;;ADqDA;EACI;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;;AAEA;EACI;;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAIJ;AACI;EACA;;;AAGJ;EACI;;;AAIA;AACI;EACA;;AAGJ;EACI;;;AAKR;EACI;;;AExNJ;EACI;EACA;EACA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;EACA;;AAEA;EACI;;;AAMhB;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;IACI;;EAIA;IACI;;;AAMZ;EACI;EACA;;AAEA;EAJJ;IAKQ;;;;AAIR;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;AAEA;EANJ;IAOQ;;;AAGJ;EACI;;;AAIR;EACI;EACA;EACA;EACA;AACA;EACA;;;AAGJ;EACI;EACA;EACA;;AAEA;EACI;;AAGJ;EATJ;IAUQ;IACA;;;;AAKR;EACI;EACA;EACA;EACA;EACA;EACA;;AAGI;EACI;;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;;AAIR;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;;;AAOJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;;AAEA;EACI;;AAGJ;EACI;;AAIR;EACI;;AAEA;EACI;;;ACzLZ;AACA;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;AAAA;EAEI;EACA;;;AAGJ;AAEA;AACA;EACI;EACA;;;AAGJ;AAEA;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;;;AAIA;EACI;;AAGJ;EACI;EACA;;;AAIR;AAAA;AAAA;EAGI;;;AAGJ;AAEA;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKJ;AAEA;EACI;IACI;IACA;IACA;IACA;IACA;;EAGJ;IACI;;EAGJ;IACI;IACA;IACA;;;AC/QR;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;;AAKZ;EACI;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAEA;EHaJ;;;AGLI;EACI;;AAEA;EHER;;AGMQ;EACI;;;ACxDhB;EACI;EACA;;AAII;AAAA;AAAA;EAGI;;AAGJ;EACI;;AAIA;EADJ;IAEQ;;;AAIR;EACI;;AAGJ;EACI;;;AAKZ;AAAA;AAAA;EAGI;;;AAKA;EACI;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;;;AAKZ;EACI;;;AAIA;EACI;;AAEA;EACI;EACA;;;AAMR;EACI;;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;;AAIR;EACI;IACI;;EAGJ;IACI;IACA;;EAGJ;IACI;IACA;IACA;IACA;IACA;IACA;;;AAIR;EACI;EACA;;;AAKJ;EACI;EACA;EACA;EACA;EACA;AACA;EACA;;;AAKA;EACI","file":"homepage-v1.css"}
\ No newline at end of file
diff --git a/source/_static/js/myscript-v1.js b/source/_static/js/myscript-v1.js
index c9473758213..58e6c68e29b 100644
--- a/source/_static/js/myscript-v1.js
+++ b/source/_static/js/myscript-v1.js
@@ -2,6 +2,7 @@ $(document).ready(function () {
     // Function to set the custom theme attribute based on the current theme
     function setCustomTheme(theme) {
         $('body').attr('data-custom-theme', theme);
+        $('html').attr('data-theme', theme);
     }
 
     // Check for a manually set theme
diff --git a/source/_static/scss/partials/_sidebar.scss b/source/_static/scss/partials/_sidebar.scss
index d953ce5a9a2..7b5279fe226 100644
--- a/source/_static/scss/partials/_sidebar.scss
+++ b/source/_static/scss/partials/_sidebar.scss
@@ -50,7 +50,13 @@
     }
 }
 
+.DocSearch-Container {
+    margin-top: 55px;
+}
+
 .sidebar-search {
+    display: none;
+
     border-radius: 4px;
     border: 1px solid rgba(63, 67, 80, 0.16);
     background: #FFF;
@@ -69,6 +75,7 @@ body:not([data-custom-theme="light"]) {
 }
 
 .sidebar-search-container:before {
+    height: 0px;
     left: 32px;
     z-index: 20;
     background-color: currentColor;
diff --git a/source/_templates/custom-nav.html b/source/_templates/custom-nav.html
index 0aaff701e48..cab020e980a 100644
--- a/source/_templates/custom-nav.html
+++ b/source/_templates/custom-nav.html
@@ -1,3 +1,26 @@
+<script src="https://cdn.jsdelivr.net/npm/typesense-docsearch.js@3.4.0"></script>
+<script>
+	window.addEventListener('load', () => {
+		const options = location.hostname === 'localhost' ? {
+			node: { host: 'localhost', port: '8108', protocol: 'http' },
+			apiKey: 'test_api_key',
+		} : {
+			node: { host: 'h0agqxfpir543j9lp-1.a1.typesense.net', port: '443', protocol: 'https' },
+			apiKey: 'ZOLa3xKupe9e7DRPhkv56g8VUoCygd00',
+		};
+
+		docsearch({
+			container: '.sidebar-search-container',
+			typesenseCollectionName: 'mm_product_docs',
+			typesenseServerConfig: {
+				nodes: [options.node],
+				apiKey: options.apiKey
+			},
+			typesenseSearchParams: {}
+		});
+	});
+</script>
+
 <div data-swiftype-index=false class="notification-bar sticky-top">
     <div class="notification-bar__content">
         <a class="notification-bar__close" data-ol-has-click-handler="">
@@ -69,7 +92,7 @@
 											<a href="https://mattermost.com/channels/">
 												Channels
 											</a>
-										</li>	
+										</li>
 										<li class="sub-menu__links--single">
 											<a href="https://mattermost.com/playbooks/">
 												Playbooks
@@ -127,7 +150,7 @@
 											<a href="https://mattermost.com/enterprise/cloud/">
 											Cloud
 											</a>
-										</li>	
+										</li>
 									</ul>
 								</div>
 							</div>
@@ -173,7 +196,7 @@
 											<a href="https://mattermost.com/solutions/use-cases/integrated-security-operations/">
 											Integrated Security Operations
 											</a>
-										</li>	
+										</li>
 										<li class="sub-menu__links--single">
 											<a href="https://mattermost.com/solutions/use-cases/out-of-band-incident-response/">
 											Out-of-Band Incident Response
@@ -384,7 +407,7 @@
 									<div class="sub-menu__dev-link-col">
 										<p class="sub-menu__link-col-header sub-menu__link-col-header-space">Documentation</p>
 										<ul>
-											
+
 											<li class="sub-menu__links--single">
 												<a href="https://academy.mattermost.com/">
 												Academy
@@ -429,7 +452,7 @@
 												<a href="https://mattermost.com/community/">
 													Join Community
 												</a>
-											</li>	
+											</li>
 											<li class="sub-menu__links--single">
 												<a href="https://mattermost.com/contribute/">
 													Contribute
diff --git a/source/conf.py b/source/conf.py
index 7c892d3a1d4..33a3c386277 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -4072,7 +4072,8 @@ def setup(_: Sphinx):
 html_css_files = [
     "css/mattermost-global.css",
     "css/homepage-v1.css",
-    "css/compass-icons.css"
+    "css/compass-icons.css",
+    "https://cdn.jsdelivr.net/npm/typesense-docsearch-css@0.3.0",
 ]
 
 # A list of JavaScript filenames. The entry must be a filename string or a tuple containing the filename string and the
diff --git a/typesense/.env.sample b/typesense/.env.sample
new file mode 100644
index 00000000000..4046d487e2d
--- /dev/null
+++ b/typesense/.env.sample
@@ -0,0 +1,8 @@
+export TYPESENSE_API_KEY=test_api_key
+export TYPESENSE_HOSTNAME=localhost
+export TYPESENSE_ORIGIN=http://localhost:8108
+export TYPESENSE_PORT=8108
+export TYPESENSE_PROTOCOL=http
+
+export TYPESENSE_COLLECTION_NAME="mm_product_docs_1745019244"
+export DOCS_SITE_ORIGIN="http://localhost:8000"
diff --git a/typesense/.gitignore b/typesense/.gitignore
new file mode 100644
index 00000000000..4c49bd78f1d
--- /dev/null
+++ b/typesense/.gitignore
@@ -0,0 +1 @@
+.env
diff --git a/typesense/README.md b/typesense/README.md
new file mode 100644
index 00000000000..00841669cdc
--- /dev/null
+++ b/typesense/README.md
@@ -0,0 +1,43 @@
+# Using Typesense for documentation search
+
+With 3 terminals open, and run the following in the first two:
+- `make livehtml` - Run Sphinx docs server
+- `cd typesense && docker compose` - Run Typesense server and Typesense dashboard. You can access the Typesense dashboard at http://localhost:8001
+
+After those are up and running, run this in the third terminal:
+- `cd typesense && docker compose --profile optional up scraper` - Run scraper to populate Typesense. The process will exit once complete.
+
+After running the scraper, we need to do some processing to make search result urls relative to the docs site.
+- `cd typesense && ./post-process-typesense-data.sh`
+
+If you'd like to re-index the Typesense collection, you can run:
+
+```sh
+cd typesense
+
+# Optionally delete all existing documents in the collection. Typesense will de-duplicate docs naturally, but this reset operation forces it to remove metadata from previous runs that we may want to remove as we change the schema/filters.
+./scripts/reset-typesense-collection.sh
+
+# Re-run scraper to populate Typesense
+docker compose --profile optional up scraper
+```
+
+To export the index into a jsonl file, run:
+
+```sh
+cd typesense
+
+./scripts/download-typesense-collection.sh
+```
+
+The output of the command will be a `documents.jsonl` file in the current directory.
+
+---
+
+The scripts mentioned above support the following environment variables for configuration:
+
+- `TYPESENSE_API_KEY` - Defaults to `test_api_key`
+- `TYPESENSE_ORIGIN` - Defaults to `http://localhost:8108`
+- `TYPESENSE_HOSTNAME` - Defaults to `localhost`
+- `TYPESENSE_PORT` - Defaults to `8108`
+- `TYPESENSE_PROTOCOL` - Defaults to `http`
diff --git a/typesense/config.json b/typesense/config.json
new file mode 100644
index 00000000000..9f3aaefb059
--- /dev/null
+++ b/typesense/config.json
@@ -0,0 +1,39 @@
+{
+  "index_name": "mm_product_docs",
+  "allowed_domains": [
+    "localhost",
+    "mattermost-docs-preview-pulls.s3-website-us-east-1.amazonaws.com"
+  ],
+  "start_urls": [
+    {
+      "url": "http://localhost:8000",
+      "tags": []
+    }
+  ],
+  "sitemap_urls": [
+    "http://localhost:8000/sitemap.xml"
+  ],
+  "selectors": {
+    "default": {
+      "lvl0": "article h1",
+      "lvl1": "article h2",
+      "lvl2": "article h3",
+      "lvl3": "article h4",
+      "lvl4": "article h5",
+      "lvl5": "article h6",
+      "text": "article p, article li"
+    }
+  },
+  "custom_settings": {
+    "token_separators": [
+      "-"
+    ],
+    "symbols_to_index": [
+      "@"
+    ]
+  },
+  "strip_chars": " .,;:#",
+  "stop_urls": [],
+  "scrape_start_urls": false,
+  "nb_hits": 64205
+}
\ No newline at end of file
diff --git a/typesense/docker-compose.yml b/typesense/docker-compose.yml
new file mode 100644
index 00000000000..67a7d1c5686
--- /dev/null
+++ b/typesense/docker-compose.yml
@@ -0,0 +1,35 @@
+services:
+  typesense:
+    image: typesense/typesense:0.24.0
+    environment:
+      - TYPESENSE_API_KEY=test_api_key
+      - TYPESENSE_DATA_DIR=/data
+      - TYPESENSE_ENABLE_CORS=true
+    ports:
+      - "8108:8108"
+    volumes:
+      - typesense-data:/data
+
+  typesense-dashboard:
+    image: ghcr.io/bfritscher/typesense-dashboard:latest
+    ports:
+      - "8001:80"
+
+  scraper:
+    image: typesense/docsearch-scraper
+    profiles:
+      - optional
+    volumes:
+      - ./config.json:/app/config.json
+    network_mode: "host"
+    environment:
+      - CONFIG=/app/config.json
+      - TYPESENSE_DATA_DIR=/data
+      - TYPESENSE_ENABLE_CORS=true
+      - TYPESENSE_API_KEY=${TYPESENSE_API_KEY:-test_api_key}
+      - TYPESENSE_HOST=${TYPESENSE_HOSTNAME:-localhost}
+      - TYPESENSE_PORT=${TYPESENSE_PORT:-8108}
+      - TYPESENSE_PROTOCOL=${TYPESENSE_PROTOCOL:-http}
+
+volumes:
+  typesense-data:
diff --git a/typesense/post-process-typesense-data.sh b/typesense/post-process-typesense-data.sh
new file mode 100755
index 00000000000..873d8bd04da
--- /dev/null
+++ b/typesense/post-process-typesense-data.sh
@@ -0,0 +1,18 @@
+set -e
+
+export TYPESENSE_ORIGIN="${TYPESENSE_ORIGIN:-http://localhost:8108}"
+export TYPESENSE_API_KEY="${TYPESENSE_API_KEY:-test_api_key}"
+export DOCS_SITE_ORIGIN="${DOCS_SITE_ORIGIN:-http://localhost:8000}"
+export TYPESENSE_COLLECTION_NAME="${TYPESENSE_COLLECTION_NAME:-mm_product_docs}"
+
+echo "Downloading typesense collection"
+./scripts/download-typesense-collection.sh
+
+echo "Cleaning relative links in typesense collection"
+./scripts/clean-relative-links-in-typesense-collection.sh
+
+echo "Importing typesense collection"
+./scripts/import-typesense-collection.sh
+
+echo "Making alias for typesense collection"
+./scripts/make-alias-for-typesense-collection.sh
diff --git a/typesense/scripts/clean-relative-links-in-typesense-collection.sh b/typesense/scripts/clean-relative-links-in-typesense-collection.sh
new file mode 100755
index 00000000000..066d3f3a43c
--- /dev/null
+++ b/typesense/scripts/clean-relative-links-in-typesense-collection.sh
@@ -0,0 +1,18 @@
+input_file="documents.jsonl"
+output_file="processed_documents.jsonl"
+
+DOCS_SITE_ORIGIN="${DOCS_SITE_ORIGIN:-http://localhost:8000}"
+
+cat "documents.jsonl" | python3 -c "
+import sys, json
+
+for line in sys.stdin:
+    try:
+        doc = json.loads(line)
+        for key in ['url', 'url_without_anchor', 'url_without_variables']:
+            if key in doc and doc[key].startswith('${DOCS_SITE_ORIGIN}'):
+                doc[key] = doc[key][len('${DOCS_SITE_ORIGIN}'):]
+        print(json.dumps(doc))
+    except Exception as e:
+        print(f'// skipped invalid line: {line.strip()}', file=sys.stderr)
+" > processed_documents.jsonl
diff --git a/typesense/scripts/create-typesense-collection.sh b/typesense/scripts/create-typesense-collection.sh
new file mode 100644
index 00000000000..3c1f973fe2d
--- /dev/null
+++ b/typesense/scripts/create-typesense-collection.sh
@@ -0,0 +1,15 @@
+TYPESENSE_ORIGIN="${TYPESENSE_ORIGIN:-http://localhost:8108}"
+TYPESENSE_API_KEY="${TYPESENSE_API_KEY:-test_api_key}"
+
+curl "${TYPESENSE_ORIGIN}/collections" \
+       -X POST \
+       -H "Content-Type: application/json" \
+       -H "X-TYPESENSE-API-KEY: ${TYPESENSE_API_KEY}" \
+       -d '{
+         "name": "mm_product_docs",
+         "fields": [
+           {"name": "category", "type": "string" },
+           {"name": "weight", "type": "int32" }
+         ],
+         "default_sorting_field": "weight"
+       }'
diff --git a/typesense/scripts/delete-typesense-collection.sh b/typesense/scripts/delete-typesense-collection.sh
new file mode 100755
index 00000000000..0971fd374be
--- /dev/null
+++ b/typesense/scripts/delete-typesense-collection.sh
@@ -0,0 +1,6 @@
+TYPESENSE_ORIGIN="${TYPESENSE_ORIGIN:-http://localhost:8108}"
+TYPESENSE_API_KEY="${TYPESENSE_API_KEY:-test_api_key}"
+TYPESENSE_COLLECTION_NAME="${TYPESENSE_COLLECTION_NAME:-mm_product_docs}"
+
+curl -X DELETE "${TYPESENSE_ORIGIN}/collections/${TYPESENSE_COLLECTION_NAME}" \
+     -H "X-TYPESENSE-API-KEY: ${TYPESENSE_API_KEY}"
diff --git a/typesense/scripts/download-typesense-collection.sh b/typesense/scripts/download-typesense-collection.sh
new file mode 100755
index 00000000000..172efbda0aa
--- /dev/null
+++ b/typesense/scripts/download-typesense-collection.sh
@@ -0,0 +1,8 @@
+TYPESENSE_ORIGIN="${TYPESENSE_ORIGIN:-http://localhost:8108}"
+TYPESENSE_API_KEY="${TYPESENSE_API_KEY:-test_api_key}"
+TYPESENSE_COLLECTION_NAME="${TYPESENSE_COLLECTION_NAME:-mm_product_docs}"
+
+curl "${TYPESENSE_ORIGIN}/collections/${TYPESENSE_COLLECTION_NAME}/documents/export" \
+       -X GET \
+       -H "X-TYPESENSE-API-KEY: ${TYPESENSE_API_KEY}" \
+       -o documents.jsonl
diff --git a/typesense/scripts/import-typesense-collection.sh b/typesense/scripts/import-typesense-collection.sh
new file mode 100755
index 00000000000..7e839e33cbb
--- /dev/null
+++ b/typesense/scripts/import-typesense-collection.sh
@@ -0,0 +1,8 @@
+TYPESENSE_ORIGIN="${TYPESENSE_ORIGIN:-http://localhost:8108}"
+TYPESENSE_API_KEY="${TYPESENSE_API_KEY:-test_api_key}"
+TYPESENSE_COLLECTION_NAME="${TYPESENSE_COLLECTION_NAME:-mm_product_docs}"
+
+curl -X POST "${TYPESENSE_ORIGIN}/collections/${TYPESENSE_COLLECTION_NAME}/documents/import?action=upsert" \
+     -H "X-TYPESENSE-API-KEY: ${TYPESENSE_API_KEY}" \
+     -H "Content-Type: text/plain" \
+     --data-binary @processed_documents.jsonl
diff --git a/typesense/scripts/make-alias-for-typesense-collection.sh b/typesense/scripts/make-alias-for-typesense-collection.sh
new file mode 100755
index 00000000000..8d1919e29e6
--- /dev/null
+++ b/typesense/scripts/make-alias-for-typesense-collection.sh
@@ -0,0 +1,9 @@
+TYPESENSE_ORIGIN="${TYPESENSE_ORIGIN:-http://localhost:8108}"
+TYPESENSE_API_KEY="${TYPESENSE_API_KEY:-test_api_key}"
+TYPESENSE_COLLECTION_NAME="${TYPESENSE_COLLECTION_NAME:-mm_product_docs}"
+
+curl "${TYPESENSE_ORIGIN}/aliases/mm_product_docs" -X PUT \
+    -H "Content-Type: application/json" \
+    -H "X-TYPESENSE-API-KEY: ${TYPESENSE_API_KEY}" -d "{
+        \"collection_name\": \"${TYPESENSE_COLLECTION_NAME}\"
+    }"
diff --git a/typesense/scripts/reset-typesense-collection.sh b/typesense/scripts/reset-typesense-collection.sh
new file mode 100755
index 00000000000..2b8461a5780
--- /dev/null
+++ b/typesense/scripts/reset-typesense-collection.sh
@@ -0,0 +1,7 @@
+TYPESENSE_ORIGIN="${TYPESENSE_ORIGIN:-http://localhost:8108}"
+TYPESENSE_API_KEY="${TYPESENSE_API_KEY:-test_api_key}"
+TYPESENSE_COLLECTION_NAME="mm_product_docs"
+
+curl -X DELETE \
+  "${TYPESENSE_ORIGIN}/collections/${TYPESENSE_COLLECTION_NAME}/documents?truncate=true&filter_by=anchor:!=none" \
+  -H "X-TYPESENSE-API-KEY: ${TYPESENSE_API_KEY}"