diff --git a/README.md b/README.md
index 19a7c50..f332c50 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ Documentation is available [ReadTheDocs](http://portainer.readthedocs.io/en/late
 * MariaDB (based on `mariadb:latest`)
 * PostgreSQL (based on `postgres:latest`)
 * Mongo (based on `mongo:latest`)
+* CockroachDB (based on `cockroachdb/cockroach:latest`)
 * Elasticsearch (based on `elasticsearch:latest`)
 * Solr (based on `solr:latest`)
 * Redis (based on `redis:latest`)
diff --git a/templates.json b/templates.json
index b24e997..70bda31 100644
--- a/templates.json
+++ b/templates.json
@@ -85,6 +85,18 @@
     ],
     "volumes": ["/data/db"]
   },
+  {
+    "title": "CockroachDB",
+    "description": "An open source, survivable, strongly consistent, scale-out SQL database.",
+    "logo": "https://cloudinovasi.id/assets/img/logos/cockroachdb.png",
+    "image": "cockroachdb/cockroach:latest",
+    "ports": [
+      "26257/tcp",
+      "8080/tcp"
+    ],
+    "volumes": ["/cockroach/cockroach-data"],
+    "command": "start --insecure"
+  },
   {
     "title": "Elasticsearch",
     "description": "Open-source search and analytics engine",