diff --git a/templates/shinyproxy-2-conf.yml.j2 b/templates/shinyproxy-2-conf.yml.j2
index 94bda82..f5d3383 100644
--- a/templates/shinyproxy-2-conf.yml.j2
+++ b/templates/shinyproxy-2-conf.yml.j2
@@ -111,7 +111,7 @@ proxy:
 {% if app.environment is defined %}
     container-env:
 {% for env in app.environment %}
-      {{ env.name }}: {{ env.value }}
+      {{ env.name }}: "{{ env.value }}"
 {% endfor %}
 {% endif %}
 
@@ -150,7 +150,7 @@ management:
 {% if shinyproxy_version is version_compare('2.6.0', '>=') %}
 spring:
   application: 
-    name: {{ shinyproxy_spring_name }}
+    name: "{{ shinyproxy_spring_name }}"
 {% endif %}
 
 logging: