diff --git a/components/tyk-dashboard/templates/deployment-dashboard.yaml b/components/tyk-dashboard/templates/deployment-dashboard.yaml
index bbc41219..345c63e0 100644
--- a/components/tyk-dashboard/templates/deployment-dashboard.yaml
+++ b/components/tyk-dashboard/templates/deployment-dashboard.yaml
@@ -104,7 +104,7 @@ spec:
             value: "{{ .Values.dashboard.hostConfig.overrideHostname}}"
           - name: "TYK_DB_HOMEDIR"
             value: "{{ .Values.dashboard.homeDir }}"
-          - name: "TYK_DB_USESHARDEDANALYTICS"
+          - name: "TYK_DB_USESHARDEDANLAYTICS"
             value: "{{ .Values.dashboard.useShardedAnalytics }}"
           - name: "TYK_DB_ENABLEANALYTICSCACHE"
             value: "{{ .Values.dashboard.enableAnalyticsCache }}"
diff --git a/tyk-control-plane/values.yaml b/tyk-control-plane/values.yaml
index d7ee65ed..a91af594 100644
--- a/tyk-control-plane/values.yaml
+++ b/tyk-control-plane/values.yaml
@@ -683,7 +683,7 @@ tyk-pump:
 
     # backend defines the pumps to be created by default, as an array of string.
     # Supported backends are:
-    #   - "mongo": Enables Mongo Aggregate and Mongo Selective Pump
+    #   - "mongo": Enables Mongo, Mongo Aggregate and Mongo Selective Pump
     #   - "mongo-aggregate": Enables ONLY Mongo Aggregate AND Mongo Graph Pump
     #   - "mongo-selective": Enables ONLY Mongo Selective
     #   - "postgres": Enables Postgres Aggregate, Postgres Graph Aggregate, SQL Pump and SQL graph pump
@@ -960,7 +960,7 @@ tyk-dashboard:
     # If using the mongo-pump-selective pump, where data is written to org-id-specific collections in MongoDB,
     # then enabling this option will switch querying for analytics over to the independent collection entries.
     # It is used to set TYK_DB_USESHARDEDANALYTICS
-    useShardedAnalytics: false
+    useShardedAnalytics: true
     # If using the new Aggregate Pump, Tyk Analytics can make use of the newer, faster Analytics lookup,
     # to ensure that this can be made backwards compatible.This option must be set to true,
     # in conjunction with the aggregate_lookup_cutoff value.
diff --git a/tyk-data-plane/values.yaml b/tyk-data-plane/values.yaml
index f33edc53..c9a0b96a 100644
--- a/tyk-data-plane/values.yaml
+++ b/tyk-data-plane/values.yaml
@@ -554,7 +554,7 @@ tyk-pump:
 
     # backend defines the pumps to be created by default, as an array of string.
     # Supported backends are:
-    #   - "mongo": Enables Mongo Aggregate and Mongo Selective Pump
+    #   - "mongo": Enables Mongo, Mongo Aggregate and Mongo Selective Pump
     #   - "mongo-aggregate": Enables ONLY Mongo Aggregate AND Mongo Graph Pump
     #   - "mongo-selective": Enables ONLY Mongo Selective
     #   - "postgres": Enables Postgres Aggregate, Postgres Graph Aggregate, SQL Pump and SQL graph pump
diff --git a/tyk-oss/values.yaml b/tyk-oss/values.yaml
index 7af889d2..9fc653a0 100644
--- a/tyk-oss/values.yaml
+++ b/tyk-oss/values.yaml
@@ -593,7 +593,7 @@ tyk-pump:
 
     # backend defines the pumps to be created by default, as an array of string.
     # Supported backends are:
-    #   - "mongo": Enables Mongo Aggregate and Mongo Selective Pump
+    #   - "mongo": Enables Mongo, Mongo Aggregate and Mongo Selective Pump
     #   - "mongo-aggregate": Enables ONLY Mongo Aggregate AND Mongo Graph Pump
     #   - "mongo-selective": Enables ONLY Mongo Selective
     #   - "postgres": Enables Postgres Aggregate, Postgres Graph Aggregate, SQL Pump and SQL graph pump
diff --git a/tyk-stack/values.yaml b/tyk-stack/values.yaml
index b9f89170..22448621 100644
--- a/tyk-stack/values.yaml
+++ b/tyk-stack/values.yaml
@@ -680,7 +680,7 @@ tyk-pump:
 
     # backend defines the pumps to be created by default, as an array of string.
     # Supported backends are:
-    #   - "mongo": Enables Mongo Aggregate and Mongo Selective Pump
+    #   - "mongo": Enables Mongo, Mongo Aggregate and Mongo Selective Pump
     #   - "mongo-aggregate": Enables ONLY Mongo Aggregate AND Mongo Graph Pump
     #   - "mongo-selective": Enables ONLY Mongo Selective
     #   - "postgres": Enables Postgres Aggregate, Postgres Graph Aggregate, SQL Pump and SQL graph pump
@@ -951,7 +951,7 @@ tyk-dashboard:
     # If using the mongo-pump-selective pump, where data is written to org-id-specific collections in MongoDB,
     # then enabling this option will switch querying for analytics over to the independent collection entries.
     # It is used to set TYK_DB_USESHARDEDANALYTICS
-    useShardedAnalytics: false
+    useShardedAnalytics: true
     # If using the new Aggregate Pump, Tyk Analytics can make use of the newer, faster Analytics lookup,
     # to ensure that this can be made backwards compatible.This option must be set to true,
     # in conjunction with the aggregate_lookup_cutoff value.