diff --git a/infra-templates/portainer/0/README.md b/infra-templates/portainer/0/README.md
new file mode 100644
index 0000000..e199e62
--- /dev/null
+++ b/infra-templates/portainer/0/README.md
@@ -0,0 +1,46 @@
+**_Portainer_** is a lightweight management UI which allows you to **easily** manage your Docker host or Swarm cluster.
+
+**_Portainer_** is meant to be as **simple** to deploy as it is to use. It consists of a single container that can run on any Docker engine (Docker for Linux and Docker for Windows are supported).
+
+**_Portainer_** allows you to manage your Docker containers, images, volumes, networks and more ! It is compatible with the *standalone Docker* engine and with *Docker Swarm*.
+
+## Getting started
+
+Once you have deploy the stack you can access the Portainer UI at `http://<RANCHER SERVER>/r/projects/<PROJECT ID>/portainer/`.
+For example
+
+    http://rancher-server:8080/r/projects/1a5/portainer/
+
+Note, the trailing / is important in the URL
+
+## Demo
+
+<img src="http://portainer.io/images/screenshots/portainer.gif" width="77%"/>
+
+You can try out the public demo instance: http://demo.portainer.io/ (login with the username **demo** and the password **tryportainer**).
+
+Please note that the public demo cluster is **reset every 15min**.
+
+## Getting help
+
+* Documentation: https://portainer.readthedocs.io
+* Issues: https://github.com/portainer/portainer/issues
+* FAQ: https://portainer.readthedocs.io/en/latest/faq.html
+* Gitter (chat): https://gitter.im/portainer/Lobby
+* Slack: http://portainer.io/slack/
+
+## Reporting bugs and contributing
+
+* Want to report a bug or request a feature? Please open [an issue](https://github.com/portainer/portainer/issues/new).
+* Want to help us build **_portainer_**? Follow our [contribution guidelines](https://portainer.readthedocs.io/en/latest/contribute.html) to build it  locally and make a pull request. We need all the help we can get!
+
+## Limitations
+
+**_Portainer_** has full support for the following Docker versions:
+
+* Docker 1.10 to Docker 1.12 (including `swarm-mode`)
+* Docker Swarm >= 1.2.3
+
+Partial support for the following Docker versions (some features may not be available):
+
+* Docker 1.9
diff --git a/infra-templates/portainer/0/docker-compose.yml b/infra-templates/portainer/0/docker-compose.yml
new file mode 100644
index 0000000..6282e35
--- /dev/null
+++ b/infra-templates/portainer/0/docker-compose.yml
@@ -0,0 +1,15 @@
+portainer:
+  labels:
+    io.rancher.sidekicks: ui
+    io.rancher.container.create_agent: true
+    io.rancher.container.agent.role: environment
+  image: rancher/portainer-agent:v0.1.0
+  volumes:
+  - /config
+
+ui:
+  image: portainer/portainer:pr572
+  command: --no-auth --external-endpoints=/config/config.json --sync-interval=5s -p :80
+  volumes_from:
+  - portainer
+  net: container:portainer
diff --git a/infra-templates/portainer/0/rancher-compose.yml b/infra-templates/portainer/0/rancher-compose.yml
new file mode 100644
index 0000000..8588474
--- /dev/null
+++ b/infra-templates/portainer/0/rancher-compose.yml
@@ -0,0 +1,5 @@
+.catalog:
+  name: "Portainer"
+  version: "pr572"
+  description: Open-source lightweight management UI for a Docker host or Swarm cluster
+  minimum_rancher_version: v1.5.0-rc1
diff --git a/infra-templates/portainer/catalogIcon.png b/infra-templates/portainer/catalogIcon.png
new file mode 100644
index 0000000..6331853
Binary files /dev/null and b/infra-templates/portainer/catalogIcon.png differ
diff --git a/infra-templates/portainer/config.yml b/infra-templates/portainer/config.yml
new file mode 100644
index 0000000..c059619
--- /dev/null
+++ b/infra-templates/portainer/config.yml
@@ -0,0 +1,5 @@
+name: portainer
+description: |
+  Portainer is an open-source lightweight management UI which allows you to easily manage your Docker host or Swarm cluster
+version: pr572
+category: Management