diff --git a/templates/EclipseChe-Single.1/0/README.md b/templates/EclipseChe-Single.1/0/README.md
new file mode 100644
index 0000000..76eb8c6
--- /dev/null
+++ b/templates/EclipseChe-Single.1/0/README.md
@@ -0,0 +1,43 @@
+# Eclipse Che (Single User)
+
+[Official Website](https://www.eclipse.org/che/)
+[Docker Page](https://hub.docker.com/r/eclipse/che/)
+
+[v6 Documentation](https://www.eclipse.org/che/docs/6/che/docs/index.html)
+
+
+
+
+
+##### CLI Reference
+
+USAGE:
+`  docker run -it --rm *<DOCKER_PARAMETERS>* eclipse/che-cli:*<version>* *[COMMAND]*`
+
+COMMANDS:
+`  action *<action-name>*`                 Start action on che instance
+`  backup`                                 Backups che configuration and data to /data/backup volume mount
+`  config`                                 Generates a che config from vars; run on any start / restart
+`  destroy`                                Stops services, and deletes che instance data
+`  dir *<command>*`                        Use Chedir and Chefile in the directory mounted to :/chedir
+`  download`                               Pulls Docker images for the current che version
+`  help`                                   This message
+`  info`                                   Displays info about che and the CLI
+`  init`                                   Initializes a directory with a che install
+`  offline`                                Saves che Docker images into TAR files for offline install
+`  restart`                                Restart che services
+`  restore`                                Restores che configuration and data from /data/backup mount
+`  rmi`                                    Removes the Docker images for <version>, forcing a repull
+`  ssh *<wksp-name>* *[machine-name]*`     SSH to a workspace if SSH agent enabled
+`  start`                                  Starts che services
+`  stop`                                   Stops che services
+`  sync *<wksp-name>*`                     Synchronize workspace with local directory mounted to :/sync
+`  test *<test-name>*`                     Start test on che instance
+`  upgrade`                                Upgrades che from one version to another with migrations and backups
+`  version`                                Installed version and upgrade paths
+
+GLOBAL COMMAND OPTIONS:
+`  --fast`                                 Skips networking, version, nightly and preflight checks
+`  --offline`                              Runs CLI in offline mode, loading images from disk
+`  --debug`                                Enable debugging of che server
+`  --trace`                                Activates trace output for debugging CLI
\ No newline at end of file
diff --git a/templates/EclipseChe-Single.1/0/docker-compose.yml b/templates/EclipseChe-Single.1/0/docker-compose.yml
new file mode 100644
index 0000000..7771f09
--- /dev/null
+++ b/templates/EclipseChe-Single.1/0/docker-compose.yml
@@ -0,0 +1,37 @@
+version: '2'
+services:
+  che-server:
+    image: eclipse/che-server:latest
+    dns:
+      - 1.1.1.1
+      - 1.0.0.1
+    environment:
+      CHE_DOCKER_IP_EXTERNAL: ${TRAEFIK_HOST}
+      CHE_HOST: ${TRAEFIK_HOST}
+      CHE_IN_VM: true
+    labels:
+      io.rancher.container.pull_image: always
+      {{- if .Values.HOST_LABEL}}
+      io.rancher.scheduler.affinity:host_label: ${HOST_LABEL}
+      {{- end}}
+      {{- if .Values.TRAEFIK_HOST}}
+      traefik.enable: true
+      traefik.port: "80"
+      {{- if .Values.TRAEFIK_BASIC_AUTH}}
+      traefik.frontend.auth.basic: ${TRAEFIK_BASIC_AUTH}
+      {{- end}}
+#      traefik.frontend.headers.SSLRedirect: true
+      traefik.frontend.entryPoints: http,https
+      traefik.frontend.redirect.entryPoint: https
+      traefik.frontend.redirect.permanent: true
+      traefik.frontend.rule: Host:${TRAEFIK_HOST}
+      {{- else}}
+      traefik.enable: false
+      {{- end}}
+    ports:
+      - "${CHE_PORT}:8080"
+    restart: on-failure
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /RancherCattleData/${DATA_DIR}/Data:/data
+      - /RancherCattleData/${DATA_DIR}/Repo:/repo
\ No newline at end of file
diff --git a/templates/EclipseChe-Single.1/0/rancher-compose.yml b/templates/EclipseChe-Single.1/0/rancher-compose.yml
new file mode 100644
index 0000000..ac833e4
--- /dev/null
+++ b/templates/EclipseChe-Single.1/0/rancher-compose.yml
@@ -0,0 +1,59 @@
+version: '2'
+catalog:
+  name: Eclipse Che (Single-User)
+  version: latest
+  # description:
+  # minimum_rancher_version:
+  # maximum_rancher_version:
+  # upgrade_from:
+  questions:
+
+    - variable: HOST_LABEL
+      label: "Host Label Key/Value Pair"
+      description: |
+        The Label Key/Value pair on the host which containers should be deployed
+      default: "host.id=Host2"
+      required: false
+      type: string
+
+    - variable: "TRAEFIK_HOST"
+      label: "Public Host Domain"
+      description: |
+        The host that Traefik will use to provide public access.
+        Leaving this empty will disable Traefik on this stack.
+      default: "subdomain.domain.tld"
+      required: false
+      type: string
+
+#    - variable: "HOST_IP"
+#      label: "Host IP Address"
+#      description: |
+#        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: "20100"
+      required: true
+      type: string
+
+    - variable: "TRAEFIK_BASIC_AUTH"
+      label: "Basic Authentication Expression"
+      description: |
+        Sets basic authentication for that frontend in CSV format "User:Hash,User:Hash".
+        Leaving this empty will disable Traefik's Basic Authentication functionality
+      #default: ""
+      required: false
+      type: string
+
+    - variable: DATA_DIR
+      label: "Data Directory"
+      description: |
+        The directory to store persistent data
+      default: "Personal/EclipseChe-Single"
+      required: true
+      type: string
\ No newline at end of file
diff --git a/templates/EclipseChe-Single.1/config.yml b/templates/EclipseChe-Single.1/config.yml
new file mode 100644
index 0000000..3c52ae2
--- /dev/null
+++ b/templates/EclipseChe-Single.1/config.yml
@@ -0,0 +1,8 @@
+name: Eclipse Che (Single-User)
+description: |
+  Status: NOT READY
+# version:
+# category:
+maintainer: WilliamMiceli
+# license:
+projectURL: https://www.eclipse.org/che/
\ No newline at end of file