diff --git a/.github/workflows/docker-unified.yml b/.github/workflows/docker-unified.yml
index a2769a7991386..0550d86e8f450 100644
--- a/.github/workflows/docker-unified.yml
+++ b/.github/workflows/docker-unified.yml
@@ -427,14 +427,8 @@ jobs:
             cypress_matrix="$cypress_matrix"',{"test_strategy":"cypress","batch_count":"'"$cypress_batch_count"'","batch":"'"$i"'"}'
           done
 
-          includes=''
-          if [[ "${{ needs.setup.outputs.backend_change }}" == 'true' || "${{ needs.setup.outputs.smoke_test_change }}" == 'true' || "${{ needs.setup.outputs.publish }}" == 'true' ]]; then
-            includes="$python_matrix,$cypress_matrix"
-          elif [[  "${{ needs.setup.outputs.frontend_only }}" == 'true' ]]; then
-            includes="$cypress_matrix"
-          elif [[ "${{ needs.setup.outputs.ingestion_only }}" == 'true' ]]; then
-            includes="$python_matrix"
-          fi
+          includes="$python_matrix,$cypress_matrix"
+
           echo "matrix={\"include\":[$includes] }" >> "$GITHUB_OUTPUT"
 
   smoke_test:
@@ -540,6 +534,12 @@ jobs:
           DATAHUB_ACTIONS_IMAGE: ${{ env.DATAHUB_ACTIONS_IMAGE }}
           ACTIONS_EXTRA_PACKAGES: "acryl-datahub-actions[executor] acryl-datahub-actions"
           ACTIONS_CONFIG: "https://raw.githubusercontent.com/acryldata/datahub-actions/main/docker/config/executor.yaml"
+          ELASTICSEARCH_SHIM_AUTO_DETECT: true
+          ELASTICSEARCH_SHIM_ENABLED: true
+          ELASTICSEARCH_SHIM_ENGINE_TYPE: AUTO_DETECT
+          DATAHUB_SEARCH_IMAGE: elasticsearch
+          DATAHUB_SEARCH_TAG: 8.17.10
+          DATAHUB_ANALYTICS_ENABLED: false
         run: |
           # Quickstart uses PROFILE_NAME env if defined to start the profile specified. Defaults to quickstart-consumers
           ./smoke-test/run-quickstart.sh