diff --git a/bin/stacks/analytics-stack.ts b/bin/stacks/analytics-stack.ts
index 39a29cf..3085844 100644
--- a/bin/stacks/analytics-stack.ts
+++ b/bin/stacks/analytics-stack.ts
@@ -471,6 +471,9 @@ export class AnalyticsStack extends cdk.NestedStack {
           roleArn: firehoseRole.roleArn,
           compressionFormat: 'UNCOMPRESSED',
         },
+        cloudWatchLoggingOptions: {
+          enabled: true,
+        },
         roleArn: firehoseRole.roleArn,
         copyCommand: {
           copyOptions: "JSON 'auto ignorecase'",
@@ -496,6 +499,9 @@ export class AnalyticsStack extends cdk.NestedStack {
 
     const rfqRequestFirehoseStream = new aws_firehose.CfnDeliveryStream(this, 'RfqRequestStream', {
       redshiftDestinationConfiguration: {
+        cloudWatchLoggingOptions: {
+          enabled: true,
+        },
         clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
         username: 'admin',
         password: creds.secretValueFromJson('password').toString(),
@@ -529,6 +535,9 @@ export class AnalyticsStack extends cdk.NestedStack {
 
     const uraResponseStream = new aws_firehose.CfnDeliveryStream(this, 'UnifiedRoutingResponseStream', {
       redshiftDestinationConfiguration: {
+        cloudWatchLoggingOptions: {
+          enabled: true,
+        },
         clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
         username: 'admin',
         password: creds.secretValueFromJson('password').toString(),
@@ -562,6 +571,9 @@ export class AnalyticsStack extends cdk.NestedStack {
 
     const rfqResponseFirehoseStream = new aws_firehose.CfnDeliveryStream(this, 'RfqResponseStream', {
       redshiftDestinationConfiguration: {
+        cloudWatchLoggingOptions: {
+          enabled: true,
+        },
         clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
         username: 'admin',
         password: creds.secretValueFromJson('password').toString(),
@@ -595,6 +607,9 @@ export class AnalyticsStack extends cdk.NestedStack {
 
     const fillStream = new aws_firehose.CfnDeliveryStream(this, 'FillRedshiftStream', {
       redshiftDestinationConfiguration: {
+        cloudWatchLoggingOptions: {
+          enabled: true,
+        },
         clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
         username: 'admin',
         password: creds.secretValueFromJson('password').toString(),
@@ -628,6 +643,9 @@ export class AnalyticsStack extends cdk.NestedStack {
 
     const orderStream = new aws_firehose.CfnDeliveryStream(this, 'OrderStream', {
       redshiftDestinationConfiguration: {
+        cloudWatchLoggingOptions: {
+          enabled: true,
+        },
         clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
         username: 'admin',
         password: creds.secretValueFromJson('password').toString(),
@@ -661,6 +679,9 @@ export class AnalyticsStack extends cdk.NestedStack {
 
     const botOrderLoaderStream = new aws_firehose.CfnDeliveryStream(this, 'botOrderLoaderStream', {
       redshiftDestinationConfiguration: {
+        cloudWatchLoggingOptions: {
+          enabled: true,
+        },
         clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
         username: 'admin',
         password: creds.secretValueFromJson('password').toString(),
@@ -694,6 +715,9 @@ export class AnalyticsStack extends cdk.NestedStack {
 
     const botOrderRouterStream = new aws_firehose.CfnDeliveryStream(this, 'botOrderRouterStream', {
       redshiftDestinationConfiguration: {
+        cloudWatchLoggingOptions: {
+          enabled: true,
+        },
         clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
         username: 'admin',
         password: creds.secretValueFromJson('password').toString(),
@@ -727,6 +751,9 @@ export class AnalyticsStack extends cdk.NestedStack {
 
     const botOrderBroadcasterStream = new aws_firehose.CfnDeliveryStream(this, 'botOrderBroadcasterStream', {
       redshiftDestinationConfiguration: {
+        cloudWatchLoggingOptions: {
+          enabled: true,
+        },
         clusterJdbcurl: `jdbc:redshift://${rsCluster.clusterEndpoint.hostname}:${rsCluster.clusterEndpoint.port}/${RS_DATABASE_NAME}`,
         username: 'admin',
         password: creds.secretValueFromJson('password').toString(),
diff --git a/bin/stacks/firehose-stack.ts b/bin/stacks/firehose-stack.ts
index 7720391..1bd0c28 100644
--- a/bin/stacks/firehose-stack.ts
+++ b/bin/stacks/firehose-stack.ts
@@ -38,7 +38,10 @@ export class FirehoseStack extends cdk.NestedStack {
         roleArn: firehoseRole.roleArn,
         compressionFormat: 'GZIP',
         prefix: 'events/',
-      } 
+        cloudWatchLoggingOptions: {
+          enabled: true,
+        },
+      },
     });
     this.analyticsStreamArn = analyticsEventsStream.attrArn;
   }