diff --git a/templates/invoice-ninja/0/docker-compose.yml b/templates/invoice-ninja/0/docker-compose.yml
index b203113..6baacd7 100644
--- a/templates/invoice-ninja/0/docker-compose.yml
+++ b/templates/invoice-ninja/0/docker-compose.yml
@@ -5,14 +5,14 @@ services:
     depends_on:
       - db
     labels:
-      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL_KEY}=${HOST_LABEL_VALUE}
+      io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE}
       io.rancher.sidekicks: cron, web
     networks:
       - ninja-net
     restart: on-failure
     volumes:
-      - ${VOLUME_LOGO}:/var/www/app/public/logo:nocopy
-      - ${VOLUME_STORAGE}:/var/www/app/storage:nocopy
+      - ${STORAGE_BASE_DIR}${LOGO_DIR}:/var/www/app/public/logo
+      - ${STORAGE_BASE_DIR}${STORAGE_DIR}:/var/www/app/storage
   cron:
     image: invoiceninja/invoiceninja
     entrypoint: |
@@ -26,35 +26,32 @@ services:
       done
       EOF'
     labels:
-      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL_KEY}=${HOST_LABEL_VALUE}
+      io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE}
     networks:
       - ninja-net
     restart: on-failure
     volumes_from:
       - app
   db:
-    image: mysql
-    environment:
-      - MYSQL_ROOT_PASSWORD=test123456
-      - MYSQL_DATABASE=ninja
+    image: mysql:5
     labels:
-      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL_KEY}=${HOST_LABEL_VALUE}
+      io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE}
     restart: on-failure
     volumes:
-      - ${VOLUME_DB}:/var/lib/mysql:nocopy
+      - ${STORAGE_BASE_DIR}${DB_DIR}:/var/lib/mysql
   web:
     image: nginx
     depends_on:
       - app
     labels:
-      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL_KEY}=${HOST_LABEL_VALUE}
+      io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE}
     networks:
       - ninja-net
     ports:
-      - "8000:8000"
+      - "${WEB_PORT}:80"
     restart: on-failure
     volumes:
-      - ${VOLUME_WEB}:/etc/nginx:nocopy
+      - ${STORAGE_BASE_DIR}${WEB_DIR}:/etc/nginx
     volumes_from:
       - app
 environment:
@@ -66,8 +63,9 @@ environment:
   - DB_HOST='db'
   - DB_STRICT='false'
   - DB_TYPE='mysql'
-  - DB_USERNAME='root'
-  - DB_PASSWORD='test123456'
+  - DB_USERNAME='ninja'
+  - DB_PASSWORD='ninja'
+  - MYSQL_ROOT_PASSWORD='ninja'
+  - MYSQL_DATABASE='ninja'
 networks:
-  ninja-net:
-volumes_driver: rancher-nfs
\ No newline at end of file
+  ninja-net:
\ No newline at end of file
diff --git a/templates/invoice-ninja/0/rancher-compose.yml b/templates/invoice-ninja/0/rancher-compose.yml
index e119ef2..1a65830 100644
--- a/templates/invoice-ninja/0/rancher-compose.yml
+++ b/templates/invoice-ninja/0/rancher-compose.yml
@@ -4,67 +4,53 @@ catalog:
   version: "latest"
   description: Invoicing
   questions:
-    - variable: "HOST_LABEL_KEY"
-      label: "Host Label Key"
+    - variable: "LABEL_KEY_VALUE"
+      label: "Host Label Key/Value Pair"
       description: |
-        The Label Key on the host which InvoiceNinja should be deployed
-      default: "host.id"
+        The Label Key/Value pair on the host which Eclipse Che should be deployed
+      default: "host.id=0000"
       required: true
       type: string
-    - variable: "HOST_LABEL_VALUE"
-      label: "Host Label Value"
+    - variable: "WEB_PORT"
+      label: "Port Number"
       description: |
-        The Label Value on the host which InvoiceNinja should be deployed
-      default: "0000"
+        Port to access the web interface on
+      default: "8000"
       required: true
       type: string
-    - variable: "VOLUME_LOGO"
-      label: "Persistent Logo Volume"
+    - variable: "STORAGE_BASE_DIR"
+      label: "Base Storage Directory"
       description: |
-        The volume name that should be used for persistent storage
-      default: "InvoiceNinja-Logo"
+        The base path of where persistent storage should be kept at.
+      default: "/RancherNetworkStorage/ContainerStorage/InvoiceNinja"
       required: true
       type: string
-    - variable: "VOLUME_STORAGE"
-      label: "Persistent Storage Volume"
+    - variable: "LOGO_DIR"
+      label: "Logo Directory"
       description: |
-        The volume name that should be used for persistent storage
-      default: "InvoiceNinja-Storage"
+        The
+      default: "/Logo"
       required: true
       type: string
-    - variable: "VOLUME_DB"
-      label: "Persistent Data Volume"
+    - variable: "STORAGE_DIR"
+      label: "Storage Directory"
       description: |
-        The volume name that should be used for persistent storage
-      default: "InvoiceNinja-DB"
+        The
+      default: "/Storage"
       required: true
       type: string
-    - variable: "VOLUME_WEB"
-      label: "Persistent Web Server Storage Volume"
+    - variable: "DB_DIR"
+      label: "Database Directory"
       description: |
-        The volume name that should be used for persistent storage
-      default: "InvoiceNinja-Web"
+        The
+      default: "/Database"
       required: true
       type: string
-    - variable: "DB_DATABASE"
-      label: "Name of the database"
+    - variable: "WEB_DIR"
+      label: "Web Server Data Directory"
       description: |
-        The volume name that should be used for persistent storage
-      default: "ninja"
-      required: true
-      type: string
-    - variable: "DB_USERNAME"
-      label: "Username for the database"
-      description: |
-        The volume name that should be used for persistent storage
-      default: "ninja"
-      required: true
-      type: string
-    - variable: "DB_PASSWORD"
-      label: "Password for the database user"
-      description: |
-        The volume name that should be used for persistent storage
-      default: "ninja"
+        The
+      default: "/Web"
       required: true
       type: string
     - variable: "APP_URL"