diff --git a/.github/workflows/deploy-preview.yaml b/.github/workflows/deploy-preview.yaml
index e855d05..cd4e751 100644
--- a/.github/workflows/deploy-preview.yaml
+++ b/.github/workflows/deploy-preview.yaml
@@ -59,9 +59,9 @@ jobs:
         run: hugo --logLevel info -D -e staging
         env:
           # HUGO_PARAMS_DOCSEARCH_indexName: ${{ secrets.ALGOLIA_INDEX_NAME }}
-          HUGO_PARAMS_DOCSEARCH_appID: ${{ vars.DOCSEARCH_APPID }}
-          HUGO_PARAMS_DOCSEARCH_apiKey: ${{ vars.DOCSEARCH_APIKEY }}
-          HUGO_PARAMS_DOCSEARCH_indexName: ${{ vars.DOCSEARCH_INDEXNAME }}
+          HUGO_PARAMS_DOCSEARCH_appID: ${{ secrets.DOCSEARCH_APP_ID }}
+          HUGO_PARAMS_DOCSEARCH_apiKey: ${{ secrets.DOCSEARCH_PUBLIC_API_KEY }}
+          HUGO_PARAMS_DOCSEARCH_indexName: ${{ secrets.DOCSEARCH_INDEXNAME }}
           HUGO_PARAMS_PLAUSIBLE_dataDomain: ${{ secrets.PLAUSIBLE_DOMAIN }}
           HUGO_GOOGLEANALYTICS: ${{ vars.HUGO_GOOGLEANALYTICS }}
 
@@ -82,6 +82,8 @@ jobs:
             lotusdocs-staging.vercel.app
 
   docsearch-scrape:
+    # The environment this job references
+    environment: Preview
 
     # The type of runner that the job will run on
     runs-on: ubuntu-20.04
@@ -107,6 +109,6 @@ jobs:
         id: docsearch-scrape
         uses: adapttive/algolia-docsearch-action@1.1.1
         env:
-          APPLICATION_ID: ${{ secrets.DOCSEARCH_APP_ID_PREVIEW }}
-          API_KEY: ${{ secrets.DOCSEARCH_WRITE_API_KEY_PREVIEW }}
+          APPLICATION_ID: ${{ secrets.DOCSEARCH_APP_ID }}
+          API_KEY: ${{ secrets.DOCSEARCH_WRITE_API_KEY }}
           CONFIG: ${{ steps.docsearch-config.outputs.config }}
\ No newline at end of file
diff --git a/.github/workflows/deploy-production.yaml b/.github/workflows/deploy-production.yaml
index 93b28d7..2483912 100644
--- a/.github/workflows/deploy-production.yaml
+++ b/.github/workflows/deploy-production.yaml
@@ -94,8 +94,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      # Step 2 -  Perform DocSearch crawl only if content files were changed
-      - name: Algolia crawl on content update
+      # Step 2 -  Perform DocSearch crawl and reindex of the site contents
+      - name: Algolia crawl and reindex
         uses: algolia/algoliasearch-crawler-github-actions@v1.1.13
         id: docsearch-crawl
         with: