diff --git a/BMW-Dynatrace-config/CD_charging-sessions-service/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_charging-sessions-service/alerting-profile/alerting-profile.yaml
index 08b5ea95..88082e63 100644
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/alerting-profile/alerting-profile.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/alerting-profile/alerting-profile.yaml
@@ -1,18 +1,42 @@
 config:
-- CDcharging-sessions-service: default.json
+- CD_charging-sessions-service: default.json
 
 #Prod alerting profiles for EMEA
-CDcharging-sessions-service.EMEA-Prod:
-- name: CDcharging-sessions-service PROD
-- tag: charging-sessions-service
-- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
-- env: PROD
-- skipDeployment: "false"
+CD_charging-sessions-service.EMEA-Prod:
+  - name: CDcharging-sessions-service PROD
+  - tag: charging-sessions-service
+  - mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
+  - env: PROD
+  - skipDeployment: "false"
+CD_charging-sessions-service.NA-Prod:
+  - name: CD_charging-sessions-service PROD
+  - tag: charging-sessions-service
+  - mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+  - env: PROD
+  - skipDeployment: "false"
+CD_charging-sessions-service.CN-Prod:
+  - name: CD_charging-sessions-service PROD
+  - tag: charging-sessions-service
+  - mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+  - env: PROD
+  - skipDeployment: "false"
 
 #INT alerting profiles for EMEA
-CDimiles-service.EMEA-PreProd:
-- name: CD_charging-sessions-service INT
-- tag: charging-sessions-service
-- mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
-- env: INT
-- skipDeployment: "false"
\ No newline at end of file
+CD_charging-service.EMEA-PreProd:
+  - name: CD_charging-sessions-service INT
+  - tag: charging-sessions-service
+  - mzId: CD_charging-sessions-service/management-zone/CDcharging-sessions-service.id
+  - env: INT
+  - skipDeployment: "false"
+CD_charging-sessions-service.NA-PreProd:
+  - name: CD_charging-sessions-service INT
+  - tag: charging-sessions-service
+  - mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+  - env: INT
+  - skipDeployment: "false"
+CD_charging-sessions-service.CN-PreProd:
+  - name: CD_charging-sessions-service INT
+  - tag: charging-sessions-service
+  - mzId: CD_charging-sessions-service/management-zone/CD_charging-sessions-service.id
+  - env: INT
+  - skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-sessions-service/notification/notification.yaml b/BMW-Dynatrace-config/CD_charging-sessions-service/notification/notification.yaml
index 72807c9b..485b6a0a 100644
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/notification/notification.yaml
+++ b/BMW-Dynatrace-config/CD_charging-sessions-service/notification/notification.yaml
@@ -1,29 +1,66 @@
 config:
-- CDcharging-sessions-service: msTeams.json
-- CDcharging-sessions-service_email: email.json
+- CD_charging-sessions-service: msTeams.json
+- CD_charging-sessions-service_email: email.json
 
 # Notification System for EMEA/NA/CN Prod msTeams
-CDcharging-sessions-service.EMEA-Prod:
-- name: CD_charging-sessions-service PROD
-- alertingProfile: CD_charging-sessions-service/alerting-profile/CDcharging-sessions-service.id
-- webhook: https://bmwgroup.webhook.office.com/webhookb2/f371255b-2c20-491d-9b7d-002928ba9e7f@ce849bab-cc1c-465b-b62e-18f07c9ac198/IncomingWebhook/4c3a4ba5ef1e40338c52917c0bc29c09/4d8ab66e-ec27-4bc7-8cff-5bd7abe02823
-- skipDeployment: "false"
+CD_charging-sessions-service.EMEA-Prod:
+  - name: CD_charging-sessions-service PROD
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - webhook: https://bmwgroup.webhook.office.com/webhookb2/f371255b-2c20-491d-9b7d-002928ba9e7f@ce849bab-cc1c-465b-b62e-18f07c9ac198/IncomingWebhook/4c3a4ba5ef1e40338c52917c0bc29c09/4d8ab66e-ec27-4bc7-8cff-5bd7abe02823
+  - skipDeployment: "false"
+CD_charging-sessions-service.NA-Prod:
+  - name: CD_charging-sessions-service PROD
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - webhook: https://bmwgroup.webhook.office.com/webhookb2/f371255b-2c20-491d-9b7d-002928ba9e7f@ce849bab-cc1c-465b-b62e-18f07c9ac198/IncomingWebhook/4c3a4ba5ef1e40338c52917c0bc29c09/4d8ab66e-ec27-4bc7-8cff-5bd7abe02823
+  - skipDeployment: "false"
+CD_charging-sessions-service.CN-Prod:
+  - name: CD_charging-sessions-service PROD
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - webhook: https://bmwgroup.webhook.office.com/webhookb2/f371255b-2c20-491d-9b7d-002928ba9e7f@ce849bab-cc1c-465b-b62e-18f07c9ac198/IncomingWebhook/4c3a4ba5ef1e40338c52917c0bc29c09/4d8ab66e-ec27-4bc7-8cff-5bd7abe02823
+  - skipDeployment: "false"
 
 # Notification System for EMEA/NA/CN PreProd msTeams
-CDcharging-sessions-service.EMEA-PreProd:
-- name: CD_charging-sessions-service INT
-- alertingProfile: CD_charging-sessions-service/alerting-profile/CDcharging-sessions-service.id
-- webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/0cf76894f7974aeaa28e5000a38d8d2c/66730f27-7257-45d8-8799-fdc7e4d4d178
-- skipDeployment: "false"
-
+CD_charging-sessions-service.EMEA-PreProd:
+  - name: CD_charging-sessions-service INT
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/0cf76894f7974aeaa28e5000a38d8d2c/66730f27-7257-45d8-8799-fdc7e4d4d178
+  - skipDeployment: "false"
+CD_charging-sessions-service.NA-PreProd:
+  - name: CD_charging-sessions-service INT
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/3d1d2c96e86b403989794017c57ae4b0/e2c61882-45fd-43f0-abe7-c16eb6196aaa
+  - skipDeployment: "false"
+CD_charging-sessions-service.CN-PreProd:
+  - name: CD_charging-sessions-service INT
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - webhook: https://criticaltechworks.webhook.office.com/webhookb2/b2de8193-24cf-4709-b1ad-d05f115fa08d@61f30b8e-4f6b-44fe-9bc2-041e3a9f7346/IncomingWebhook/3d1d2c96e86b403989794017c57ae4b0/e2c61882-45fd-43f0-abe7-c16eb6196aaa
+  - skipDeployment: "false"
+  
+  
 # Notification System for EMEA/NA/CN Prod Email
-CDcharging-sessions-service_email.EMEA-Prod:
+CD_charging-sessions-service_email.EMEA-Prod:
   - name: CD_charging-sessions-service_email PROD
-  - alertingProfile: CD_imiles-service/alerting-profile/CDcharging-sessions-service.id
+  - alertingProfile: CD_imiles-service/alerting-profile/CD_charging-sessions-service.id
+  - receivers: intangibles@list.bmw.com
+CD_charging-sessions-service_email.NA-Prod:
+  - name: CD_charging-sessions-service_email PROD
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - receivers: intangibles@list.bmw.com
+CD_charging-sessions-service_email.CN-Prod:
+  - name: CD_charging-sessions-service_email PROD
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
   - receivers: intangibles@list.bmw.com
 
 # Notification System for EMEA/NA/CN PreProd Email
-CDcharging-sessions-service_email.EMEA-PreProd:
+CD_charging-sessions-service_email.EMEA-PreProd:
   - name: CD_charging-sessions-service_email INT
-  - alertingProfile: CD_imiles-service/alerting-profile/CDcharging-sessions-service.id
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
   - receivers: intangibles@list.bmw.com
+CD_charging-sessions-service_email.NA-PreProd:
+  - name: CD_charging-sessions-service_email INT
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - receivers: intangibles@list.bmw.com
+CD_charging-sessions-service_email.CN-PreProd:
+  - name: CD_charging-sessions-service_email INT
+  - alertingProfile: CD_charging-sessions-service/alerting-profile/CD_charging-sessions-service.id
+  - receivers: intangibles@list.bmw.com
\ No newline at end of file