diff --git a/templates/InvoiceNinja/0/README.md b/templates/InvoiceNinja/0/README.md
index c7073b9..6c21e7f 100644
--- a/templates/InvoiceNinja/0/README.md
+++ b/templates/InvoiceNinja/0/README.md
@@ -22,4 +22,7 @@ Google Maps:
 Get an API Key [Here](https://developers.google.com/maps/documentation/javascript/get-api-key) first.
 Then add GOOGLE_MAPS_API_KEY=<your key> in your .env file.
 
-If using without HTTPS (like using the direct IP instead of through Traefik), please take out the line: "fastcgi_param HTTPS 1;" from your nginx.conf
\ No newline at end of file
+If using without HTTPS (like using the direct IP instead of through Traefik), please take out the line: "fastcgi_param HTTPS 1;" from your nginx.conf
+
+### To-Do List
+* Add documentation for easier adding environment variables, and see if there's a better way to do so
\ No newline at end of file
diff --git a/templates/InvoiceNinja/0/docker-compose.yml b/templates/InvoiceNinja/0/docker-compose.yml
index b105eb3..a6d99cf 100644
--- a/templates/InvoiceNinja/0/docker-compose.yml
+++ b/templates/InvoiceNinja/0/docker-compose.yml
@@ -14,6 +14,8 @@ services:
       - mysql
     restart: on-failure
     volumes:
+      - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
+      - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
       - /RancherCattleConfig/${DATA_DIR}/.env:/var/www/app/.env
       - /RancherCattleData/${DATA_DIR}/Logo:/var/www/app/public/logo
       - /RancherCattleData/${DATA_DIR}/Storage:/var/www/app/storage
@@ -60,9 +62,11 @@ services:
       traefik.enable: false
     restart: on-failure
     volumes:
+      - /etc/localtime:/etc/localtime:ro # Syncronize time of container with the host system
+      - /etc/timezone:/etc/timezone:ro # Syncronize timezone of container with the host system
       - /RancherCattleData/${DATA_DIR}/Database:/var/lib/mysql
   nginx:
-    image: nginx
+    image: nginx # Alpine does not work (last checked 6 December 2018)
     dns:
       - 1.1.1.1
       - 1.0.0.1
diff --git a/templates/InvoiceNinja/0/rancher-compose.yml b/templates/InvoiceNinja/0/rancher-compose.yml
index 84aed42..3711750 100644
--- a/templates/InvoiceNinja/0/rancher-compose.yml
+++ b/templates/InvoiceNinja/0/rancher-compose.yml
@@ -33,6 +33,22 @@ catalog:
       required: true
       type: string
 
+    - variable: "DB_ROOT_PASS"
+      label: "MySQL Root Password"
+      description: |
+        A secure password to be used by the "root" MySQL user.
+      # default:
+      required: true
+      type: password
+
+    - variable: "DB_USER_PASS"
+      label: "MySQL User Password"
+      description: |
+        A secure password to be used by the "ninja" MySQL user.
+      # default:
+      required: true
+      type: password
+
     - variable: DATA_DIR
       label: "Data Directory"
       description: |