diff --git a/examples/custom-network-config/application.properties b/examples/custom-network-config/application.properties
index 213d33929..202d86c31 100644
--- a/examples/custom-network-config/application.properties
+++ b/examples/custom-network-config/application.properties
@@ -14,4 +14,4 @@ hedera.profiles.active=TEST
 # TODO: this is a workaround until prepareUpgrade freeze will recalculate the weight prior to writing the config.txt
 staking.periodMins=1
 nodes.updateAccountIdAllowed=true
-blockStream.streamMode=RECORDS
+blockStream.streamMode=BOTH
diff --git a/examples/solo-gke-test/application.properties b/examples/solo-gke-test/application.properties
index afde2a4a8..342f6d0b8 100644
--- a/examples/solo-gke-test/application.properties
+++ b/examples/solo-gke-test/application.properties
@@ -14,7 +14,7 @@ hedera.profiles.active=TEST
 # TODO: this is a workaround until prepareUpgrade freeze will recalculate the weight prior to writing the config.txt
 staking.periodMins=1
 nodes.updateAccountIdAllowed=true
-blockStream.streamMode=RECORDS
+blockStream.streamMode=BOTH
 
 # Override the throttle definitions to be used during genesis.
 # This override is required because release <= 0.58.x use a different default path.
diff --git a/resources/templates/application.properties b/resources/templates/application.properties
index e827fdba5..0aa32ff23 100644
--- a/resources/templates/application.properties
+++ b/resources/templates/application.properties
@@ -14,7 +14,6 @@ hedera.profiles.active=TEST
 # TODO: this is a workaround until prepareUpgrade freeze will recalculate the weight prior to writing the config.txt
 staking.periodMins=1
 nodes.updateAccountIdAllowed=true
-# TODO: remove once we have the uploader enabled, required for current p0 deadline
-blockStream.streamMode=RECORDS
+blockStream.streamMode=BOTH
 # TODO: uncomment this when we are ready to use genesis-network.json
 #addressBook.useRosterLifecycle=true
diff --git a/src/core/constants.ts b/src/core/constants.ts
index 775ab775e..9daaaef33 100644
--- a/src/core/constants.ts
+++ b/src/core/constants.ts
@@ -52,6 +52,15 @@ export const HEDERA_NODE_INTERNAL_GOSSIP_PORT = process.env.SOLO_NODE_INTERNAL_G
 export const HEDERA_NODE_EXTERNAL_GOSSIP_PORT = process.env.SOLO_NODE_EXTERNAL_GOSSIP_PORT || '50111';
 export const HEDERA_NODE_DEFAULT_STAKE_AMOUNT = +process.env.SOLO_NODE_DEFAULT_STAKE_AMOUNT || 500;
 
+export const HEDERA_NODE_SIDECARS = [
+  'recordStreamUploader',
+  'eventStreamUploader',
+  'backupUploader',
+  'accountBalanceUploader',
+  'otelCollector',
+  'blockstreamUploader',
+];
+
 // --------------- Charts related constants ----------------------------------------------------------------------------
 export const SOLO_SETUP_NAMESPACE = 'solo-setup';
 export const SOLO_TESTING_CHART_URL = 'oci://ghcr.io/hashgraph/solo-charts';
diff --git a/src/core/profile_manager.ts b/src/core/profile_manager.ts
index fae59fa05..29ce21e84 100644
--- a/src/core/profile_manager.ts
+++ b/src/core/profile_manager.ts
@@ -36,14 +36,6 @@ import {inject, injectable} from 'tsyringe-neo';
 import {patchInject} from './container_helper.js';
 import {HEDERA_PLATFORM_VERSION} from '../../version.js';
 
-const consensusSidecars = [
-  'recordStreamUploader',
-  'eventStreamUploader',
-  'backupUploader',
-  'accountBalanceUploader',
-  'otelCollector',
-];
-
 @injectable()
 export class ProfileManager {
   private readonly logger: SoloLogger;
@@ -275,7 +267,7 @@ export class ProfileManager {
       this._setChartItems('defaults.root', profile.consensus.root, yamlRoot);
 
       // set sidecar resources
-      for (const sidecar of consensusSidecars) {
+      for (const sidecar of constants.HEDERA_NODE_SIDECARS) {
         this._setChartItems(`defaults.sidecars.${sidecar}`, profile.consensus[sidecar], yamlRoot);
       }
     }
diff --git a/test/data/test-profiles.yaml b/test/data/test-profiles.yaml
index d9deeba0a..0fc136e84 100644
--- a/test/data/test-profiles.yaml
+++ b/test/data/test-profiles.yaml
@@ -16,6 +16,14 @@ test:
         limits:
           cpu: 150m
           memory: 250Mi
+    blockstreamUploader:
+      resources:
+        requests:
+          cpu: 0
+          memory: 0
+        limits:
+          cpu: 150m
+          memory: 250Mi
     eventStreamUploader:
       resources:
         requests:
diff --git a/test/unit/core/profile_manager.test.ts b/test/unit/core/profile_manager.test.ts
index aa6093b80..0803368e6 100644
--- a/test/unit/core/profile_manager.test.ts
+++ b/test/unit/core/profile_manager.test.ts
@@ -110,13 +110,7 @@ describe('ProfileManager', () => {
         expect(valuesYaml.defaults.root.resources.limits.memory).not.to.be.null;
 
         // check all sidecars have resources
-        for (const component of [
-          'recordStreamUploader',
-          'eventStreamUploader',
-          'backupUploader',
-          'accountBalanceUploader',
-          'otelCollector',
-        ]) {
+        for (const component of constants.HEDERA_NODE_SIDECARS) {
           expect(valuesYaml.defaults.sidecars[component].resources.limits.cpu).not.to.be.null;
           expect(valuesYaml.defaults.sidecars[component].resources.limits.memory).not.to.be.null;
         }