diff --git a/templates/eclipse-che-single/0/README.md b/templates/eclipse-che-single/0/README.md
index 7779dd4..76eb8c6 100644
--- a/templates/eclipse-che-single/0/README.md
+++ b/templates/eclipse-che-single/0/README.md
@@ -9,30 +9,11 @@
 
 
 
-
-
-
-
 ##### CLI Reference
 
 USAGE:
 `  docker run -it --rm *<DOCKER_PARAMETERS>* eclipse/che-cli:*<version>* *[COMMAND]*`
 
-MANDATORY DOCKER PARAMETERS:
-```  -v *<LOCAL_PATH>*:/data```            Where user, instance, and log data saved
-
-OPTIONAL DOCKER PARAMETERS:
-`  -e CHE_HOST=*<YOUR_HOST>*`              IP address or hostname where che will serve its users
-`  -e CHE_PORT=*<YOUR_PORT>*`              Port where che will bind itself to
-`  -e CHE_CONTAINER=*<YOUR_NAME>*`         Prefix name for the che container
-`  -v *<LOCAL_PATH>*:/data/instance`       Where instance, user, log data will be saved
-`  -v *<LOCAL_PATH>*:/data/backup`         Where backup files will be saved
-`  -v *<LOCAL_PATH>*:/repo`                che git repo - uses local binaries and manifests
-`  -v *<LOCAL_PATH>*:/assembly`            che assembly - uses local binaries
-`  -v *<LOCAL_PATH>*:/sync`                Where remote ws files will be copied with sync command
-`  -v *<LOCAL_PATH>*:/unison`              Where unison profile for optimizing sync command resides
-`  -v *<LOCAL_PATH>*:/chedir`              Soure repository to convert into workspace with Chedir utility
-
 COMMANDS:
 `  action *<action-name>*`                 Start action on che instance
 `  backup`                                 Backups che configuration and data to /data/backup volume mount
diff --git a/templates/eclipse-che-single/0/docker-compose.yml b/templates/eclipse-che-single/0/docker-compose.yml
index 8261b07..2e9b881 100644
--- a/templates/eclipse-che-single/0/docker-compose.yml
+++ b/templates/eclipse-che-single/0/docker-compose.yml
@@ -2,15 +2,19 @@ version: '2'
 services:
   che-server:
     image: eclipse/che-server:latest
+    container_name: eclipse-che
+    dns:
+      - 1.1.1.1
+      - 1.0.0.1
     environment:
       - CHE_HOST=${HOST_IP}
+      - CHE_PORT=${CHE_PORT}
     labels:
-      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL_KEY}=${HOST_LABEL_VALUE}
+      io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE}
     ports:
-      - "8080:8080"
+      - ${CHE_PORT}":8080"
     restart: on-failure
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - ${DATA_VOLUME}:/data:nocopy
-      - ${REPO_VOLUME}:/repo:nocopy
-volumes_driver: rancher-nfs
\ No newline at end of file
+      - ${STORAGE_BASE_DIR}${DATA_DIR}:/data
+      - ${STORAGE_BASE_DIR}${REPO_DIR}:/repo
\ No newline at end of file
diff --git a/templates/eclipse-che-single/0/rancher-compose.yml b/templates/eclipse-che-single/0/rancher-compose.yml
index 9b0ad23..fb068b8 100644
--- a/templates/eclipse-che-single/0/rancher-compose.yml
+++ b/templates/eclipse-che-single/0/rancher-compose.yml
@@ -4,38 +4,45 @@ catalog:
   version: "latest"
   description: A new awesome web IDE
   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 Eclipse Che should be deployed
-      default: "host.id"
-      required: true
-      type: string
-    - variable: "HOST_LABEL_VALUE"
-      label: "Host Label Value"
-      description: |
-        The Label Value on the host which Eclipse Che should be deployed
-      default: "0000"
-      required: true
-      type: string
-    - variable: "DATA_VOLUME"
-      label: "Persistent Storage Volume"
-      description: |
-        The Volume Name that Eclipse Che should use for it's persistent data storage
-      default: "Eclipse-Data"
-      required: true
-      type: string
-    - variable: "REPO_VOLUME"
-      label: "Persistent Storage Volume"
-      description: |
-        The Volume Name that Eclipse Che should use for it's persistent repo storage
-      default: "Eclipse-Repo"
+        The Label Key/Value pair on the host which Eclipse Che should be deployed
+      default: "host.id=0000"
       required: true
       type: string
     - variable: "HOST_IP"
-      label: "IP of the host system"
+      label: "Host IP Address"
       description: |
-        Host IP
-      default: "10.0.0.0"
+        IP of the host system
+      default: "0.0.0.0"
+      required: true
+      type: string
+    - variable: "CHE_PORT"
+      label: "Port Number"
+      description: |
+        Port to access the web interface on
+      default: "8080"
+      required: true
+      type: string
+    - variable: "STORAGE_BASE_DIR"
+      label: "Base Storage Directory"
+      description: |
+        The base path of where persistent storage should be kept at.
+      default: "/RancherNetworkStorage/ContainerStorage/EclipseChe-SingleUser"
+      required: true
+      type: string
+    - variable: "DATA_DIR"
+      label: "Data Directory"
+      description: |
+        The directory Eclipse Che should use for it's persistent data storage
+      default: "/Data"
+      required: true
+      type: string
+    - variable: "REPO_DIR"
+      label: "Persistent Storage Volume"
+      description: |
+        The directory Eclipse Che should use for it's persistent repo storage
+      default: "/Repo"
       required: true
       type: string
\ No newline at end of file