diff --git a/.github/workflows/deploy-develop.yml b/.github/workflows/deploy-develop.yml
index 86afae54342..08139803103 100644
--- a/.github/workflows/deploy-develop.yml
+++ b/.github/workflows/deploy-develop.yml
@@ -47,7 +47,7 @@ jobs:
         NODE_OPTIONS: --max-old-space-size=4096
         ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
         ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
-        ALGOLIA_INDEX_NAME: edb-staging
+        ALGOLIA_INDEX_NAME: edb-docs-staging
         INDEX_ON_BUILD: true
 
     - name: Netlify deploy
diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml
index 99b25dbf82b..59b7cf8b129 100644
--- a/.github/workflows/deploy-main.yml
+++ b/.github/workflows/deploy-main.yml
@@ -47,7 +47,7 @@ jobs:
         NODE_OPTIONS: --max-old-space-size=4096
         ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
         ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
-        ALGOLIA_INDEX_NAME: edb
+        ALGOLIA_INDEX_NAME: edb-docs
         GTM_ID: GTM-5W8M67
         INDEX_ON_BUILD: true
 
diff --git a/gatsby-config.js b/gatsby-config.js
index b25303d7dae..2b8dce18413 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -11,7 +11,7 @@ const ANSI_STOP = '\033[0m';
 
 const isBuild = process.env.NODE_ENV === 'production';
 const isProduction = process.env.APP_ENV === 'production';
-const algoliaIndex = process.env.ALGOLIA_INDEX_NAME || 'edb-staging';
+const algoliaIndex = process.env.ALGOLIA_INDEX_NAME || 'edb-docs-staging';
 
 /******** Sourcing *********/
 const sourceFilename = isBuild ? 'build-sources.json' : 'dev-sources.json';
diff --git a/src/components/search/index.js b/src/components/search/index.js
index 6ae6aa089a0..adb5f5a9c79 100644
--- a/src/components/search/index.js
+++ b/src/components/search/index.js
@@ -16,8 +16,8 @@ import { SlashIndicator, ClearButton, SearchPane } from './formComps';
 import useSiteMetadata from '../../hooks/use-sitemetadata';
 
 const searchClient = algoliasearch(
-  'NQVJGNW933',
-  '3089ae4f190ea7c91590336eeba5f0ea',
+  'HXNAF5X3I8',
+  'fb05499144f0399f5985485b624a0290',
 );
 
 const useClickOutside = (ref, handler, events) => {
diff --git a/src/pages/404.js b/src/pages/404.js
index 52cefee22fa..852470ada8c 100644
--- a/src/pages/404.js
+++ b/src/pages/404.js
@@ -14,8 +14,8 @@ import useSiteMetadata from '../hooks/use-sitemetadata';
 import usePathPrefix from '../hooks/use-path-prefix';
 
 const searchClient = algoliasearch(
-  'NQVJGNW933',
-  '3089ae4f190ea7c91590336eeba5f0ea',
+  'HXNAF5X3I8',
+  'fb05499144f0399f5985485b624a0290',
 );
 
 const buildQuery = (pathname, pathPrefix) => {
diff --git a/src/pages/search.js b/src/pages/search.js
index eb8661f5971..57264ff7c03 100644
--- a/src/pages/search.js
+++ b/src/pages/search.js
@@ -13,8 +13,8 @@ import {
 import useSiteMetadata from '../hooks/use-sitemetadata';
 
 const searchClient = algoliasearch(
-  'NQVJGNW933',
-  '3089ae4f190ea7c91590336eeba5f0ea',
+  'HXNAF5X3I8',
+  'fb05499144f0399f5985485b624a0290',
 );
 
 const Search = (data) => {