diff --git a/templates/jmasar.service.j2 b/templates/jmasar.service.j2
index 25503fb3318c491e151564cf4c5c911c982e7a25..ae3b49848208e29f2a8328e217c7b44c0f7b1fd1 100644
--- a/templates/jmasar.service.j2
+++ b/templates/jmasar.service.j2
@@ -8,7 +8,7 @@ WorkingDirectory=/opt/jmasar
 Environment='EPICS_CA_ADDR_LIST={{ jmasar_epics_ca_addr_list }}'
 Environment=EPICS_CA_AUTO_ADDR_LIST={{ jmasar_epics_ca_auto_addr_list }}
 {% if jmasar_graylog_host %}
-ExecStart={{ java_openjdk_bin }} -DGRAYLOG_HOST={{ jmasar_graylog_host }} -DGRAYLOG_PORT={{ jmasar_graylog_port }} {% for x in (jmasar_env | dict2items) %}-D{{ x.key }}={{ x.value }} {% endfor %}-jar jmasar-service.jar    
+ExecStart={{ java_openjdk_bin }} -DGRAYLOG_HOST={{ jmasar_graylog_host }} -DGRAYLOG_PORT={{ jmasar_graylog_port }} {% for x in (jmasar_env | dict2items) %}-D{{ x.key }}='{{ x.value }}' {% endfor %}-jar jmasar-service.jar    
 {% else %}
 ExecStart={{ java_openjdk_bin }} -jar jmasar-service.jar
 {% endif %}