diff --git a/sharelatex/defaults/main.yml b/sharelatex/defaults/main.yml
index bc610f8a..3236db63 100644
--- a/sharelatex/defaults/main.yml
+++ b/sharelatex/defaults/main.yml
@@ -11,6 +11,7 @@ sharelatex_hostname: '{{ ansible_fqdn }}'
 sharelatex_local_mongodb: False
 sharelatex_local_redis: False
 sharelatex_local_nginx: False
+sharelatex_secure_cookie: False
 
 sharelatex_mongodb_host: 'localhost'
 sharelatex_mongodb_db: 'sharelatex'
diff --git a/sharelatex/tasks/main.yml b/sharelatex/tasks/main.yml
index e118ff08..be291440 100644
--- a/sharelatex/tasks/main.yml
+++ b/sharelatex/tasks/main.yml
@@ -24,7 +24,7 @@
       become: True
       become_user: docker
       #command: docker run -v {{ sharelatex_host_data_dir }}:{{ sharelatex_container_data_dir }} -p {{ sharelatex_container_public_port }}:{{ sharelatex_container_local_port }} --name={{ sharelatex_container_name }} --env-file {{ docker_user_home }}/sharelatex/sharelatex-env.sh {{ sharelatex_docker_image }}
-      docker_container: name={{ sharelatex_container_name }} volumes:{{ sharelatex_host_data_dir }}:{{ sharelatex_container_data_dir }} published_ports={{ sharelatex_container_public_port }}:{{ sharelatex_container_local_port }} env_file={{ docker_user_home }}/sharelatex/sharelatex-env.sh image={{ sharelatex_docker_image }} state=started
+      docker_container: name={{ sharelatex_container_name }} volumes:{{ sharelatex_host_data_dir }}:{{ sharelatex_container_data_dir }} published_ports={{ sharelatex_container_public_port }}:{{ sharelatex_container_local_port }} env_file={{ docker_user_home }}/sharelatex/sharelatex-env.sh image={{ sharelatex_docker_image }} state=started keep_volumes=yes pull=yes
       when: docker_run_as_docker_user
 
     - name: Start the Sharelatex docker container as root
diff --git a/sharelatex/templates/sharelatex-env.sh.j2 b/sharelatex/templates/sharelatex-env.sh.j2
index cd7b6100..2a709cf4 100644
--- a/sharelatex/templates/sharelatex-env.sh.j2
+++ b/sharelatex/templates/sharelatex-env.sh.j2
@@ -2,8 +2,14 @@ SHARELATEX_MONGO_URL={{ sharelatex_mongodb_url }}
 SHARELATEX_REDIS_HOST={{ sharelatex_redis_host }}
 SHARELATEX_APP_NAME='{{ sharelatex_app_name }}'
 SHARELATEX_SITE_URL={{ sharelatex_site_url }}
-SHARELATEX_NAV_TITLE='D4Science ShareLaTeX Service'
+SHARELATEX_NAV_TITLE='{{ sharelatex_app_name }}'
 SHARELATEX_BEHIND_PROXY='{{ sharelatex_behind_proxy }}'
+{% if sharelatex_secure_cookie %}
+SHARELATEX_SECURE_COOKIE=true
+{% endif %}
+{% if sharelatex_session_secret is defined %}
+SHARELATEX_SESSION_SECRET={{ sharelatex_session_secret }}
+{% endif %}
 {% if sharelatex_header_image_url is defined %}
 SHARELATEX_HEADER_IMAGE_URL={{ sharelatex_header_image_url }}
 {% endif %}