diff --git a/public/v4/apps/leantime.yml b/public/v4/apps/leantime.yml
index 2669935..db14813 100644
--- a/public/v4/apps/leantime.yml
+++ b/public/v4/apps/leantime.yml
@@ -10,7 +10,7 @@ services:
             MYSQL_PASSWORD: $$cap_mysql_passwd
         caproverExtra:
             dockerfileLines:
-                - FROM mysql:5.7
+                - FROM mysql:8.0.32
                 - CMD ["--character-set-server=utf8", "--collation-server=utf8_unicode_ci"]
     $$cap_appname:
         image: leantime/leantime:$$cap_leantime_ver
@@ -21,23 +21,41 @@ services:
             LEAN_DB_USER: leantimeuser
             LEAN_DB_PASSWORD: $$cap_mysql_passwd
             LEAN_DB_DATABASE: leantime
+            LEAN_DEFAULT_TIMEZONE: $$cap_timezone
+            LEAN_SESSION_PASSWORD: $$cap_gen_random_hex(32)
+            LEAN_SESSION_EXPIRATION: 28800
 caproverOneClickApp:
     variables:
-        - description: User password for the database instance.
-          defaultValue: N2cQ4J9VzsfvXwzM
-          id: $$cap_mysql_passwd
+        - id: $$cap_mysql_passwd
           label: MySQL User Password
+          description: User password for the database instance.
+          defaultValue: $$cap_gen_random_hex(16)
           validRegex: /^(?=.*\d).{10,}$/
-        - defaultValue: 2.1.4
-          id: $$cap_leantime_ver
+        - id: $$cap_leantime_ver
           label: Leantime Version
+          description: 'Check out their Docker page for the valid tags https://hub.docker.com/r/leantime/leantime'
+          defaultValue: 2.3.6
           validRegex: /.+/
+        - id: $$cap_timezone
+          label: Timezone
+          description: This is the timezone for the application, find yours at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+          defaultValue: Europe/London
     instructions:
-        start: >-
-            Leantime is a lean project management system for innovators. Designed to help you manage your projects from ideation to delivery.
-            See more details here: https://leantime.io
-        end: Leantime is deployed as available as $$cap_appname! You MUST ENABLE HTTPS before accessing the panel.
+        start: |-
+            Leantime is an open source project management system for small teams and startups written in PHP, Javascript using MySQL. Designed to help you manage your projects from ideation to delivery.
+
+            See more details here at https://leantime.io
+        end: |-
+            ✅  Leantime has been successfully deployed and will soon be available at https://$$cap_appname.$$cap_root_domain!
+
+            ❗️ **IMPORTANT**: Before accessing the Leantime dashboard, you must enable HTTPS:
+
+            **Step 1**: Go to the settings for `$$cap_appname`
+            **Step 2**: Enable **HTTPS**
+
+            -------------------------------------------- 
+            🔰 More information on initial configuration can be found at https://docs.leantime.io/#/.
     displayName: Leantime
     isOfficial: true
-    description: Open source project management for small teams
-    documentation: https://github.com/Leantime/docker-leantime/blob/master/docker-compose.yml
+    description: Leantime is an open source project management system for small teams and startups written in PHP, Javascript using MySQL.
+    documentation: More information on initial configuration can be found at https://docs.leantime.io/#/. This template was developed using variables from https://github.com/Leantime/docker-leantime/blob/master/docker-compose.yml