diff --git a/BMW-Dynatrace-config/CD_vps-archive/calculated-metrics-service/calculated-metrics-service.yaml b/BMW-Dynatrace-config/CD_vps-archive/calculated-metrics-service/calculated-metrics-service.yaml
index c0cf0688..177e15f2 100644
--- a/BMW-Dynatrace-config/CD_vps-archive/calculated-metrics-service/calculated-metrics-service.yaml
+++ b/BMW-Dynatrace-config/CD_vps-archive/calculated-metrics-service/calculated-metrics-service.yaml
@@ -1,115 +1,115 @@
 config:
-  - VpsProvisioningCause: metric-request-count.json
-  - VpsProvisioningStatus: metric-request-count.json
-  - VpsProvisioningStatus_Backend: metric-request-count-2.json
-  - VpsProvisioningStatus_Workshop: metric-request-count-2.json
-  - VpsProvisioningStatus_UserUpdate: metric-request-count-2.json
-  - VpsProvisioningStatus_Diagnosis: metric-request-count-2.json
-  - VpsProvisioningStatus_ECU: metric-request-count-3-any-of.json
-  - VpsEcu: metric-request-count-3.json
+- VpsProvisioningCause: metric-request-count.json
+- VpsProvisioningStatus: metric-request-count.json
+- VpsProvisioningStatus_Backend: metric-request-count-2.json
+- VpsProvisioningStatus_Workshop: metric-request-count-2.json
+- VpsProvisioningStatus_UserUpdate: metric-request-count-2.json
+- VpsProvisioningStatus_Diagnosis: metric-request-count-2.json
+- VpsProvisioningStatus_ECU: metric-request-count-3-any-of.json
+- VpsEcu: metric-request-count-3.json
 
 VpsProvisioningCause:
-  - name: VpsProvisioningCause
-  - metricKey: calc:service.vpsprovisioningcause
-  - unit: COUNT
-  - requestAttribute: VpsProvisioningCause
-  - msId: VPS-Archive
-  - env: PROD
-  - dimension: "{RequestAttribute:VpsProvisioningCause}"
-  - dimensionName: VpsProvisioningCause
-  - topX: 10
+- name: VpsProvisioningCause
+- metricKey: calc:service.vpsprovisioningcause
+- unit: COUNT
+- requestAttribute: VpsProvisioningCause
+- msId: VPS-Archive
+- env: PROD
+- dimension: "{RequestAttribute:VpsProvisioningCause}"
+- dimensionName: VpsProvisioningCause
+- topX: "10"
 VpsProvisioningStatus:
-  - name: VpsProvisioningStatus
-  - metricKey: calc:service.vpsprovisioningstatus
-  - unit: COUNT
-  - requestAttribute: VpsProvisioningStatus
-  - msId: VPS-Archive
-  - env: PROD
-  - dimension: "{RequestAttribute:VpsProvisioningStatus}"
-  - dimensionName: VpsProvisioningStatus
-  - topX: 20
+- name: VpsProvisioningStatus
+- metricKey: calc:service.vpsprovisioningstatus
+- unit: COUNT
+- requestAttribute: VpsProvisioningStatus
+- msId: VPS-Archive
+- env: PROD
+- dimension: "{RequestAttribute:VpsProvisioningStatus}"
+- dimensionName: VpsProvisioningStatus
+- topX: "20"
 VpsProvisioningStatus_Backend:
-  - name: VpsProvisioningStatus_Backend
-  - metricKey: calc:service.vpsprovisioningstatus_backend
-  - unit: COUNT
-  - requestAttribute: VpsProvisioningStatus
-  - requestAttribute2: VpsProvisioningCause
-  - requestAttribute2Value: BACKEND
-  - msId: VPS-Archive
-  - env: PROD
-  - dimension: "{RequestAttribute:VpsProvisioningStatus}"
-  - dimensionName: VpsProvisioningStatus
-  - topX: 20
+- name: VpsProvisioningStatus_Backend
+- metricKey: calc:service.vpsprovisioningstatus_backend
+- unit: COUNT
+- requestAttribute: VpsProvisioningStatus
+- requestAttribute2: VpsProvisioningCause
+- requestAttribute2Value: BACKEND
+- msId: VPS-Archive
+- env: PROD
+- dimension: "{RequestAttribute:VpsProvisioningStatus}"
+- dimensionName: VpsProvisioningStatus
+- topX: "20"
 VpsProvisioningStatus_Workshop:
-  - name: VpsProvisioningStatus_Workshop
-  - metricKey: calc:service.vpsprovisioningstatus_workshop
-  - unit: COUNT
-  - requestAttribute: VpsProvisioningStatus
-  - requestAttribute2: VpsProvisioningCause
-  - requestAttribute2Value: WORKSHOP
-  - msId: VPS-Archive
-  - env: PROD
-  - dimension: "{RequestAttribute:VpsProvisioningStatus}"
-  - dimensionName: VpsProvisioningStatus
-  - topX: 20
+- name: VpsProvisioningStatus_Workshop
+- metricKey: calc:service.vpsprovisioningstatus_workshop
+- unit: COUNT
+- requestAttribute: VpsProvisioningStatus
+- requestAttribute2: VpsProvisioningCause
+- requestAttribute2Value: WORKSHOP
+- msId: VPS-Archive
+- env: PROD
+- dimension: "{RequestAttribute:VpsProvisioningStatus}"
+- dimensionName: VpsProvisioningStatus
+- topX: "20"
 VpsProvisioningStatus_UserUpdate:
-  - name: VpsProvisioningStatus_UserUpdate
-  - metricKey: calc:service.vpsprovisioningstatus_userupdate
-  - unit: COUNT
-  - requestAttribute: VpsProvisioningStatus
-  - requestAttribute2: VpsProvisioningCause
-  - requestAttribute2Value: USER_UPDATE
-  - msId: VPS-Archive
-  - env: PROD
-  - dimension: "{RequestAttribute:VpsProvisioningStatus}"
-  - dimensionName: VpsProvisioningStatus
-  - topX: 20
+- name: VpsProvisioningStatus_UserUpdate
+- metricKey: calc:service.vpsprovisioningstatus_userupdate
+- unit: COUNT
+- requestAttribute: VpsProvisioningStatus
+- requestAttribute2: VpsProvisioningCause
+- requestAttribute2Value: USER_UPDATE
+- msId: VPS-Archive
+- env: PROD
+- dimension: "{RequestAttribute:VpsProvisioningStatus}"
+- dimensionName: VpsProvisioningStatus
+- topX: "20"
 VpsProvisioningStatus_Diagnosis:
-  - name: VpsProvisioningStatus_Diagnosis
-  - metricKey: calc:service.vpsprovisioningstatus_diagnosis
-  - unit: COUNT
-  - requestAttribute: VpsProvisioningStatus
-  - requestAttribute2: VpsProvisioningCause
-  - requestAttribute2Value: DIAGNOSIS
-  - msId: VPS-Archive
-  - env: PROD
-  - dimension: "{RequestAttribute:VpsProvisioningStatus}"
-  - dimensionName: VpsProvisioningStatus
-  - topX: 20
+- name: VpsProvisioningStatus_Diagnosis
+- metricKey: calc:service.vpsprovisioningstatus_diagnosis
+- unit: COUNT
+- requestAttribute: VpsProvisioningStatus
+- requestAttribute2: VpsProvisioningCause
+- requestAttribute2Value: DIAGNOSIS
+- msId: VPS-Archive
+- env: PROD
+- dimension: "{RequestAttribute:VpsProvisioningStatus}"
+- dimensionName: VpsProvisioningStatus
+- topX: "20"
 VpsProvisioningStatus_ECU:
-  - name: VpsProvisioningStatus_ECU
-  - metricKey: calc:service.vpsprovisioningstatus_ecu
-  - unit: COUNT
-  - requestAttribute: VpsEcu
-  - requestAttribute2: VpsEcu
-  - requestAttribute2ValueNot: null
-  - requestAttribute3: VpsProvisioningStatus
-  - requestAttribute3Value1: PROVISIONED
-  - requestAttribute3Value2: SIGNATURE_WRONG
-  - requestAttribute3Value3: PROV_EXPIRED
-  - requestAttribute3Value4: WRONG_VIN
-  - requestAttribute3Value5: BAD_FILESYSTEM
-  - requestAttribute3Value6: BUSY
-  - requestAttribute3Value7: REQUEST_PROV
-  - requestAttribute3Value8: INVALID_XML
-  - requestAttribute3Value9: PROV_FAILED
-  - requestAttribute3Value10: OUTDATED
-  - msId: VPS-Archive
-  - env: PROD
-  - dimension: "{RequestAttribute:VpsEcu} : {RequestAttribute:VpsProvisioningStatus}"
-  - dimensionName: VpsProvisioningStatus
-  - topX: 50
+- name: VpsProvisioningStatus_ECU
+- metricKey: calc:service.vpsprovisioningstatus_ecu
+- unit: COUNT
+- requestAttribute: VpsEcu
+- requestAttribute2: VpsEcu
+- requestAttribute2ValueNot: "null"
+- requestAttribute3: VpsProvisioningStatus
+- requestAttribute3Value1: PROVISIONED
+- requestAttribute3Value2: SIGNATURE_WRONG
+- requestAttribute3Value3: PROV_EXPIRED
+- requestAttribute3Value4: WRONG_VIN
+- requestAttribute3Value5: BAD_FILESYSTEM
+- requestAttribute3Value6: BUSY
+- requestAttribute3Value7: REQUEST_PROV
+- requestAttribute3Value8: INVALID_XML
+- requestAttribute3Value9: PROV_FAILED
+- requestAttribute3Value10: OUTDATED
+- msId: VPS-Archive
+- env: PROD
+- dimension: "{RequestAttribute:VpsEcu} : {RequestAttribute:VpsProvisioningStatus}"
+- dimensionName: VpsProvisioningStatus
+- topX: "50"
 VpsEcu:
-  - name: VpsEcu
-  - metricKey: calc:service.vpsecu
-  - unit: COUNT
-  - requestAttribute: VpsEcu
-  - requestAttribute2: VpsEcu
-  - requestAttribute2ValueNot: null
-  - requestAttribute3: VpsProvisioningStatus
-  - requestAttribute3Value: REQUEST_PROV
-  - msId: VPS-Archive
-  - env: PROD
-  - dimension: "{RequestAttribute:VpsEcu}"
-  - dimensionName: VpsEcu
-  - topX: 20
\ No newline at end of file
+- name: VpsEcu
+- metricKey: calc:service.vpsecu
+- unit: COUNT
+- requestAttribute: VpsEcu
+- requestAttribute2: VpsEcu
+- requestAttribute2ValueNot: "null"
+- requestAttribute3: VpsProvisioningStatus
+- requestAttribute3Value: REQUEST_PROV
+- msId: VPS-Archive
+- env: PROD
+- dimension: "{RequestAttribute:VpsEcu}"
+- dimensionName: VpsEcu
+- topX: "20"
\ No newline at end of file