diff --git a/templates/apiary-hms-readonly.json b/templates/apiary-hms-readonly.json
index c6bc803..97f6599 100644
--- a/templates/apiary-hms-readonly.json
+++ b/templates/apiary-hms-readonly.json
@@ -75,7 +75,7 @@
         }
     },
     "dockerLabels": {
-        "com.datadoghq.ad.instances": "[{ \"prometheus_url\": \"http://%%host%%:8080/actuator/prometheus\", \"namespace\": \"${hms_readonly_namespace}\", \"metrics\": [${join(',', ${datadog_metrics_hms_readwrite_readonly} )}] }]"
+        "com.datadoghq.ad.instances": "[{ \"prometheus_url\": \"http://%%host%%:8080/actuator/prometheus\", \"namespace\": \"${hms_readonly_namespace}\", \"metrics\": [${join(" ,", ${datadog_metrics_hms_readwrite_readonly} )}] }]"
         "com.datadoghq.ad.check_names": "[\"prometheus\"]",
         "com.datadoghq.ad.init_configs": "[{}]"
     },
diff --git a/templates/apiary-hms-readwrite.json b/templates/apiary-hms-readwrite.json
index 972f621..dfb495a 100644
--- a/templates/apiary-hms-readwrite.json
+++ b/templates/apiary-hms-readwrite.json
@@ -75,7 +75,7 @@
         }
     },
     "dockerLabels": {
-        "com.datadoghq.ad.instances": "[{ \"prometheus_url\": \"http://%%host%%:8080/actuator/prometheus\", \"namespace\": \"${hms_readwrite_namespace}\", \"metrics\": [${join(',', var.datadog_metrics_hms_readwrite_readonly)}] }]"
+        "com.datadoghq.ad.instances": "[{ \"prometheus_url\": \"http://%%host%%:8080/actuator/prometheus\", \"namespace\": \"${hms_readwrite_namespace}\", \"metrics\": [${join(" ,", var.datadog_metrics_hms_readwrite_readonly)}] }]"
         "com.datadoghq.ad.check_names": "[\"prometheus\"]",
         "com.datadoghq.ad.init_configs": "[{}]"
   },