diff --git a/templates/portworx/0/README.md b/templates/portworx/0/README.md
index f35a373..45665d7 100644
--- a/templates/portworx/0/README.md
+++ b/templates/portworx/0/README.md
@@ -1,9 +1,15 @@
-# [1.1.2-GA Documentation](http://docs.portworx.com)
+# [1.1.6-GA Documentation](http://docs.portworx.com)
 
 This catalog will spin up Portworx on your hosts.
 There are 2 configuration variables required:
  1. **cluster_id**:  Arbitrary Cluster ID, common to all nodes in PX cluster.  (Can use https://www.uuidgenerator.net for example)
  2. **kvdb**:  A Key-value database that is accessible to all nodes in the PX cluster.  (Ex: etcd://10.0.0.42:4001)
+ 3. **header_dir**: The directory where kernel headers can be found.  Default is "/usr/src".  For CoreOS use "/lib/modules"
+ 4. **use_disks**: The list of devices to use as part of the cluster fabric. (Ex: '-a' for all disks, or '-s /dev/sdX' for each individual disk)
+
+**NOTE**: px-dev requires at least one non-root disk be attached to the running image (i.e local disk or iscsi).
+
+**NOTE**: If using Docker prior to 1.12, then you **MUST** remove 'MOUNT=shared' from the docker.service file and restart the docker service.
 
 For detailed documentation, please visit [docs.portworx.com](http://docs.portworx.com)
 
diff --git a/templates/portworx/0/docker-compose.yml b/templates/portworx/0/docker-compose.yml
index 09a891a..c5143e6 100644
--- a/templates/portworx/0/docker-compose.yml
+++ b/templates/portworx/0/docker-compose.yml
@@ -3,7 +3,7 @@ portworx:
     io.rancher.container.create_agent: 'true'
     io.rancher.scheduler.global: 'true'
     io.rancher.container.pull_image: 'always'
-  image: portworx/px-dev
+  image: portworx/px-dev:edge
   container_name: px
   ipc: host
   net: host
@@ -11,13 +11,15 @@ portworx:
   environment:
     CLUSTER_ID: ${cluster_id}
     KVDB: ${kvdb}
+    HDR_DIR: ${header_dir}
+    USE_DISKS: ${use_disks}
   volumes:
      - /dev:/dev
-     - /usr/src:/usr/src
+     - ${header_dir}:${header_dir}
      - /run/docker/plugins:/run/docker/plugins
      - /var/lib/osd:/var/lib/osd:shared
      - /etc/pwx:/etc/pwx
      - /opt/pwx/bin:/export_bin:shared
      - /var/run/docker.sock:/var/run/docker.sock
      - /var/cores:/var/cores
-  command: -c ${cluster_id} -k ${kvdb} -a -z -f
+  command: -c ${cluster_id} -k ${kvdb} ${use_disks}
diff --git a/templates/portworx/0/rancher-compose.yml b/templates/portworx/0/rancher-compose.yml
index 8e4f784..b4049c0 100644
--- a/templates/portworx/0/rancher-compose.yml
+++ b/templates/portworx/0/rancher-compose.yml
@@ -1,8 +1,8 @@
 .catalog:
   name: "Portworx"
-  version: "1.1.2-2017-01-06-GA"
+  version: "1.1.6-2017-02-08-GA"
   description: "Container Defined Storage for Docker"
-  uuid: 352669-pwx-1.1.2
+  uuid: 352669-pwx-1.1.6
   minimum_rancher_version: v0.56.0
   questions:
     - variable: cluster_id
@@ -17,3 +17,15 @@
       type: "string"
       required: true
       default: ""
+    - variable: use_disks
+      description: "Cmdline args for disks to use. Ex: '-a' for all available, or '-s /dev/sdX' for each individual disk"
+      label: "Use Disks"
+      type: "string"
+      required: true
+      default: "-s /dev/xvdb"
+    - variable: header_dir
+      description: "Directory where kernel headers can be found.  Default is '/usr/src'.  For CoreOS use '/lib/modules'"
+      label: "Headers Directory"
+      type: "string"
+      required: true
+      default: "/usr/src"
diff --git a/templates/portworx/config.yml b/templates/portworx/config.yml
index 121d6b9..56b0ce7 100644
--- a/templates/portworx/config.yml
+++ b/templates/portworx/config.yml
@@ -1,5 +1,5 @@
 name: px-dev
 description: |
   Software defined enterprise storage for Linux Containers.
-version: 1.1.2-2017-01-06-GA
+version: 1.1.6-2017-02-08-GA
 category: Storage