diff --git a/clickstream-ai-recommendation/clickstream-kafka/clickstream.table.sql b/clickstream-ai-recommendation/clickstream-kafka/clickstream.table.sql
index 4400d299..37ff5596 100644
--- a/clickstream-ai-recommendation/clickstream-kafka/clickstream.table.sql
+++ b/clickstream-ai-recommendation/clickstream-kafka/clickstream.table.sql
@@ -6,7 +6,7 @@ CREATE TABLE Clickstream (
 ) WITH (
     'connector' = 'kafka',
     'topic' = 'clickstream',
-    'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+    'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
     'properties.group.id' = 'clickstream-group',
     'scan.startup.mode' = 'group-offsets',
     'properties.auto.offset.reset' = 'earliest',
diff --git a/clickstream-ai-recommendation/content-kafka/content.table.sql b/clickstream-ai-recommendation/content-kafka/content.table.sql
index e8af6317..9ad91b04 100644
--- a/clickstream-ai-recommendation/content-kafka/content.table.sql
+++ b/clickstream-ai-recommendation/content-kafka/content.table.sql
@@ -7,9 +7,9 @@ CREATE TABLE Content (
 ) WITH (
     'connector' = 'kafka',
     'topic' = 'content',
-    'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+    'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
     'properties.group.id' = 'clickstream-group',
     'scan.startup.mode' = 'group-offsets',
     'properties.auto.offset.reset' = 'earliest',
     'format' = 'flexible-json'
-    );
\ No newline at end of file
+    );
diff --git a/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/card_assignment.table.sql b/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/card_assignment.table.sql
index 835d71d3..db5a6dbc 100755
--- a/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/card_assignment.table.sql
+++ b/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/card_assignment.table.sql
@@ -6,7 +6,7 @@ CREATE TABLE CardAssignment (
     WATERMARK FOR `timestamp` AS `timestamp` - INTERVAL '1' SECOND
 ) WITH (
       'connector' = 'kafka',
-      'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+      'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
       'properties.group.id' = 'mygroupid',
       'scan.startup.mode' = 'group-offsets',
       'properties.auto.offset.reset' = 'earliest',
diff --git a/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/merchant.table.sql b/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/merchant.table.sql
index 2f9fc09d..2de462e9 100755
--- a/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/merchant.table.sql
+++ b/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/merchant.table.sql
@@ -6,10 +6,10 @@ CREATE TABLE Merchant (
     WATERMARK FOR `updatedTime` AS `updatedTime` - INTERVAL '1' SECOND
 ) WITH (
     'connector' = 'kafka',
-    'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+    'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
     'properties.group.id' = 'mygroupid',
     'scan.startup.mode' = 'group-offsets',
     'properties.auto.offset.reset' = 'earliest',
     'value.format' = 'flexible-json',
     'topic' = 'merchant'
-    );
\ No newline at end of file
+    );
diff --git a/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/merchant_reward.table.sql b/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/merchant_reward.table.sql
index ccbaa100..e3895832 100755
--- a/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/merchant_reward.table.sql
+++ b/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/merchant_reward.table.sql
@@ -10,10 +10,10 @@ CREATE TABLE MerchantReward (
     WATERMARK FOR `updatedTime` AS `updatedTime` - INTERVAL '1' SECOND
 ) WITH (
     'connector' = 'kafka',
-    'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+    'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
     'properties.group.id' = 'mygroupid',
     'scan.startup.mode' = 'group-offsets',
     'properties.auto.offset.reset' = 'earliest',
     'value.format' = 'flexible-json',
     'topic' = 'merchantreward'
-    );
\ No newline at end of file
+    );
diff --git a/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/transaction.table.sql b/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/transaction.table.sql
index 079e2f29..9a5c4a8b 100755
--- a/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/transaction.table.sql
+++ b/finance-credit-card-chatbot/credit-card-analytics/creditcard-kafka/transaction.table.sql
@@ -7,10 +7,10 @@ CREATE TABLE Transaction (
     WATERMARK FOR `time` AS `time` - INTERVAL '1' SECOND
 ) WITH (
       'connector' = 'kafka',
-      'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+      'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
       'properties.group.id' = 'mygroupid',
       'scan.startup.mode' = 'group-offsets',
       'properties.auto.offset.reset' = 'earliest',
       'value.format' = 'flexible-json',
       'topic' = 'transaction'
-      );
\ No newline at end of file
+      );
diff --git a/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/card_assignment.table.sql b/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/card_assignment.table.sql
index 835d71d3..db5a6dbc 100755
--- a/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/card_assignment.table.sql
+++ b/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/card_assignment.table.sql
@@ -6,7 +6,7 @@ CREATE TABLE CardAssignment (
     WATERMARK FOR `timestamp` AS `timestamp` - INTERVAL '1' SECOND
 ) WITH (
       'connector' = 'kafka',
-      'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+      'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
       'properties.group.id' = 'mygroupid',
       'scan.startup.mode' = 'group-offsets',
       'properties.auto.offset.reset' = 'earliest',
diff --git a/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/merchant.table.sql b/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/merchant.table.sql
index 2f9fc09d..2de462e9 100755
--- a/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/merchant.table.sql
+++ b/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/merchant.table.sql
@@ -6,10 +6,10 @@ CREATE TABLE Merchant (
     WATERMARK FOR `updatedTime` AS `updatedTime` - INTERVAL '1' SECOND
 ) WITH (
     'connector' = 'kafka',
-    'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+    'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
     'properties.group.id' = 'mygroupid',
     'scan.startup.mode' = 'group-offsets',
     'properties.auto.offset.reset' = 'earliest',
     'value.format' = 'flexible-json',
     'topic' = 'merchant'
-    );
\ No newline at end of file
+    );
diff --git a/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/merchant_reward.table.sql b/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/merchant_reward.table.sql
index ccbaa100..e3895832 100755
--- a/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/merchant_reward.table.sql
+++ b/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/merchant_reward.table.sql
@@ -10,10 +10,10 @@ CREATE TABLE MerchantReward (
     WATERMARK FOR `updatedTime` AS `updatedTime` - INTERVAL '1' SECOND
 ) WITH (
     'connector' = 'kafka',
-    'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+    'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
     'properties.group.id' = 'mygroupid',
     'scan.startup.mode' = 'group-offsets',
     'properties.auto.offset.reset' = 'earliest',
     'value.format' = 'flexible-json',
     'topic' = 'merchantreward'
-    );
\ No newline at end of file
+    );
diff --git a/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/transaction.table.sql b/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/transaction.table.sql
index 079e2f29..9a5c4a8b 100755
--- a/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/transaction.table.sql
+++ b/finance-credit-card-chatbot/credit-card-rewards/creditcard-kafka/transaction.table.sql
@@ -7,10 +7,10 @@ CREATE TABLE Transaction (
     WATERMARK FOR `time` AS `time` - INTERVAL '1' SECOND
 ) WITH (
       'connector' = 'kafka',
-      'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+      'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
       'properties.group.id' = 'mygroupid',
       'scan.startup.mode' = 'group-offsets',
       'properties.auto.offset.reset' = 'earliest',
       'value.format' = 'flexible-json',
       'topic' = 'transaction'
-      );
\ No newline at end of file
+      );
diff --git a/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/card_assignment.table.sql b/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/card_assignment.table.sql
index 835d71d3..db5a6dbc 100755
--- a/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/card_assignment.table.sql
+++ b/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/card_assignment.table.sql
@@ -6,7 +6,7 @@ CREATE TABLE CardAssignment (
     WATERMARK FOR `timestamp` AS `timestamp` - INTERVAL '1' SECOND
 ) WITH (
       'connector' = 'kafka',
-      'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+      'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
       'properties.group.id' = 'mygroupid',
       'scan.startup.mode' = 'group-offsets',
       'properties.auto.offset.reset' = 'earliest',
diff --git a/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/merchant.table.sql b/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/merchant.table.sql
index 2f9fc09d..2de462e9 100755
--- a/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/merchant.table.sql
+++ b/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/merchant.table.sql
@@ -6,10 +6,10 @@ CREATE TABLE Merchant (
     WATERMARK FOR `updatedTime` AS `updatedTime` - INTERVAL '1' SECOND
 ) WITH (
     'connector' = 'kafka',
-    'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+    'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
     'properties.group.id' = 'mygroupid',
     'scan.startup.mode' = 'group-offsets',
     'properties.auto.offset.reset' = 'earliest',
     'value.format' = 'flexible-json',
     'topic' = 'merchant'
-    );
\ No newline at end of file
+    );
diff --git a/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/merchant_reward.table.sql b/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/merchant_reward.table.sql
index ccbaa100..e3895832 100755
--- a/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/merchant_reward.table.sql
+++ b/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/merchant_reward.table.sql
@@ -10,10 +10,10 @@ CREATE TABLE MerchantReward (
     WATERMARK FOR `updatedTime` AS `updatedTime` - INTERVAL '1' SECOND
 ) WITH (
     'connector' = 'kafka',
-    'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+    'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
     'properties.group.id' = 'mygroupid',
     'scan.startup.mode' = 'group-offsets',
     'properties.auto.offset.reset' = 'earliest',
     'value.format' = 'flexible-json',
     'topic' = 'merchantreward'
-    );
\ No newline at end of file
+    );
diff --git a/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/transaction.table.sql b/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/transaction.table.sql
index 079e2f29..9a5c4a8b 100755
--- a/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/transaction.table.sql
+++ b/finance-credit-card-chatbot/credit-card-views/creditcard-kafka/transaction.table.sql
@@ -7,10 +7,10 @@ CREATE TABLE Transaction (
     WATERMARK FOR `time` AS `time` - INTERVAL '1' SECOND
 ) WITH (
       'connector' = 'kafka',
-      'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+      'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
       'properties.group.id' = 'mygroupid',
       'scan.startup.mode' = 'group-offsets',
       'properties.auto.offset.reset' = 'earliest',
       'value.format' = 'flexible-json',
       'topic' = 'transaction'
-      );
\ No newline at end of file
+      );
diff --git a/healthcare-study/healthcare-study-stream/metrics-kafka/enriched_indicator.table.sql b/healthcare-study/healthcare-study-stream/metrics-kafka/enriched_indicator.table.sql
index 8671b7ea..0b344d3c 100644
--- a/healthcare-study/healthcare-study-stream/metrics-kafka/enriched_indicator.table.sql
+++ b/healthcare-study/healthcare-study-stream/metrics-kafka/enriched_indicator.table.sql
@@ -3,7 +3,7 @@ CREATE TABLE EnrichedIndicators (
 ) WITH (
       'connector' = 'kafka',
       'topic' = 'enrichedindicators',
-      'properties.bootstrap.servers' = '${PROPERTIES_BOOTSTRAP_SERVERS}',
+      'properties.bootstrap.servers' = '${KAFKA_BOOTSTRAP_SERVERS}',
       'properties.group.id' = 'mygroup',
       'scan.startup.mode' = 'earliest-offset',
       'value.format' = 'flexible-json',