diff --git a/shinyproxy/defaults/main.yml b/shinyproxy/defaults/main.yml
index 83173539..4d0105f3 100644
--- a/shinyproxy/defaults/main.yml
+++ b/shinyproxy/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 shinyproxy_install: False
-shinyproxy_version: 0.9.3
+shinyproxy_version: 1.0.0
 shinyproxy_file_name: 'shinyproxy-{{ shinyproxy_version }}.jar'
 shinyproxy_url: 'https://www.shinyproxy.io/downloads/{{ shinyproxy_file_name }}'
 shinyproxy_app_name: shinyproxy.jar
@@ -10,8 +10,10 @@ shinyproxy_http_port: 8080
 # For logrotate. In days
 shinyproxy_log_retention: 10
 shinyproxy_default_apps: True
-shinyproxy_docker_url: 'http://localhost:2375/'
+shinyproxy_docker_url: 'http://localhost:2375'
 shinyproxy_docker_port_range_start: 20000
+shinyproxy_container_wait_time: 60000
+shinyproxy_hide_navbar: 'false'
 
 shinyproxy_app_title: 'Open Analytics Shiny Proxy'
 shinyproxy_logo_url: 'http://www.openanalytics.eu/sites/www.openanalytics.eu/themes/oa/logo.png'
diff --git a/shinyproxy/templates/shinyproxy-conf.yml.j2 b/shinyproxy/templates/shinyproxy-conf.yml.j2
index b75b1c50..482c2fc1 100644
--- a/shinyproxy/templates/shinyproxy-conf.yml.j2
+++ b/shinyproxy/templates/shinyproxy-conf.yml.j2
@@ -5,7 +5,9 @@ shiny:
     landing-page: /
     heartbeat-rate: 10000
     heartbeat-timeout: 60000
+    container-wait-time: {{ shinyproxy_container_wait_time }}
     port: {{ shinyproxy_http_port }}
+    hide-navbar: {{ shinyproxy_hide_navbar }}
     authentication: {{ shinyproxy_authentication }}
     admin-groups: {{ shinyproxy_admin_group }}
 {% if shinyproxy_ldap_enabled %}
@@ -49,9 +51,11 @@ shiny:
     description: {{ app.description }}
     docker-cmd: ["R", "-e {{ app.cmd }}"]
     docker-image: {{ app.docker_image }}
+    docker-memory: {{ app.docker_memory | default('2g') }}
     {% if app.groups is defined %}
     groups: {{ app.groups }}
     {% endif %}
+
 {% endfor %}
 {% endif %}