diff --git a/README.md b/README.md
index 3d65161..7810466 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ It also describes how to host your own Apps.
 * WordPress (based on `wordpress:latest`)
 * Drupal (based on `drupal:latest`)
 * Magento 2 (based on `alankent/gsd:latest`)
+* Ubuntu (based on `ubuntu:latest`)
 
 ## Template definition format
 
diff --git a/templates.json b/templates.json
index 4327e2a..3745ccf 100644
--- a/templates.json
+++ b/templates.json
@@ -114,5 +114,11 @@
       "8088/tcp"
     ],
     "volumes": ["/var/lib/wowza"]
+  },
+  {
+    "title": "Ubuntu",
+    "description": "Debian-based Linux operating system",
+    "logo": "http://design.ubuntu.com/wp-content/uploads/ubuntu-logo32.png",
+    "image": "ubuntu:latest"
   }
 ]