diff --git a/tmpl/sunstone-server.conf b/tmpl/sunstone-server.conf
index afb2dbe..5b0f4ca 100644
--- a/tmpl/sunstone-server.conf
+++ b/tmpl/sunstone-server.conf
@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -28,23 +28,29 @@
 
 # Server Configuration
 #
-#:host: 127.0.0.1
 :host: %%ip_sunstone
 :port: %%port_sunstone
 
-# Place where to store sessions, this value can be memory or memcache
+# Place where to store sessions, this value can be memory, memcache or memcache-dalli
 # Use memcache when starting multiple server processes, for example,
 # with passenger
 #
 # NOTE. memcache needs a separate memcached server to be configured. Refer
 # to memcached documentation to configure the server.
-:sessions: memory
+:sessions: memcache-dalli
 
 # Memcache configuration
 :memcache_host: localhost
 :memcache_port: 11211
 :memcache_namespace: opennebula.sunstone
 
+# Excution environment for Sunstone
+#   dev, Instead of pulling the minified js all the files will be pulled (app/main.js)
+#     Check the Building from Source guide in the docs, for details on how to run
+#     Sunstone in development
+#   prod, the minified js will be used (dist/main.js)
+:env: 'prod'
+
 ################################################################################
 # Log
 ################################################################################
@@ -54,22 +60,26 @@
 #
 :debug_level: 3
 
+################################################################################
+# Proxy
+################################################################################
+
+# Enable an http proxy for the support portal and to download MarketPlaceApps
+# from the MarketPlace to the user's desktop.
+# :proxy: http://<hostname>:<port>
+
 ################################################################################
 # Auth
 ################################################################################
 
 # Authentication driver for incomming requests
-#   sunstone, for OpenNebula's user-password scheme
-#   x509, for x509 certificates based authentication
-#   opennebula, the authentication will be done by the opennebula core using the
-#   driver defined for the user
+#   sunstone: for OpenNebula's user-password scheme
+#   x509: for x509 certificates based authentication
+#   opennebula: the authentication will be done by the opennebula core using the
+#     driver defined for the user
+#   remote: performs the login based on a Kerberos REMOTE_USER
 #
-#:auth: sunstone
-%if %%getVar('sunstone_auth_modes', 'sunstone') == 'ldap'
 :auth: opennebula
-%else
-:auth: sunstone
-%end if
 
 # Authentication driver to communicate with OpenNebula core
 #   cipher, for symmetric cipher encryption of tokens
@@ -77,11 +87,20 @@
 #
 :core_auth: cipher
 
-# For LDAP auth. Encode credentials sent to OpenNebula. Turns espaces into %20.
+# For external authentication drivers, such as LDAP. Performs a URL encoding
+# on the credentials sent to OpenNebula, e.g. secret%20password
 # This only works with "opennebula" auth.
 #
 #:encode_user_password: true
 
+################################################################################
+# Check Upgrades
+################################################################################
+
+# To check for the latest release. Comment this value if you don't want to check
+# this.
+:remote_version: http://downloads.opennebula.org/latest
+
 ################################################################################
 # UI Settings
 ################################################################################
@@ -93,11 +112,16 @@
 #   vnc_proxy_cert: Certificate to encrypt wss connections.
 #   vnc_proxy_key:  Key for wss connections. Only necessary if not included in cert.
 #   vnc_proxy_ipv6: Enable ipv6 support for novnc-server
+#
+# :vnc_request_password: true | false
+#   Request VNC password for external windows, by default it will not be requested
+#
 :vnc_proxy_port: %%vnc_proxy_port_sunstone
 :vnc_proxy_support_wss: yes
 :vnc_proxy_cert: %%server_cert
 :vnc_proxy_key: %%server_key
 :vnc_proxy_ipv6: false
+:vnc_request_password: false
 
 
 # Default language setting
@@ -117,11 +141,16 @@
 #:marketplace_password:
 
 # Marketplace endpoint
+# The url should not include the /appliance path since it will be automatically
+# included
 #
 %if %%getVar('activer_market_place','non') == 'oui'
 :marketplace_url: %%market_place_url
+%else
+:marketplace_url: http://marketplace.opennebula.systems/
 %end if
 
+
 %if %%getVar('activer_oneflow', 'non') == 'oui'
 ################################################################################
 # OneFlow
@@ -129,7 +158,7 @@
 
 # OneFlow endpoint
 #
-:oneflow_server: http://%%getVar('ip_oneflow','172.0.0.1'):%%getVar('port_oneflow', '2474')/
+:oneflow_server: http://%%getVar('ip_oneflow','172.0.0.1'):%%getVar('port_oneflow','2474')/
 %end if
 
 ################################################################################
@@ -157,6 +186,8 @@
 %if %%getVar('activer_oneflow', 'non') == 'oui'
     - oneflow
 %end if
-%if %%getVar('activer_market_views', 'non') == 'oui'
+%if %%getVar('activer_market_views', 'non') == 'oui
     - appmarket
-%end if
+%end if'
+    - vcenter
+    - support