diff --git a/README.md b/README.md
index f332c50..6a03a1a 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ Documentation is available [ReadTheDocs](http://portainer.readthedocs.io/en/late
 * CockroachDB (based on `cockroachdb/cockroach:latest`)
 * Elasticsearch (based on `elasticsearch:latest`)
 * Solr (based on `solr:latest`)
+* Minio (based on `minio/minio:latest`)
 * Redis (based on `redis:latest`)
 * RabbitMQ (based on `rabbitmq:latest`)
 * WordPress (based on `wordpress:latest`)
diff --git a/templates.json b/templates.json
index 70bda31..f613e00 100644
--- a/templates.json
+++ b/templates.json
@@ -85,18 +85,6 @@
     ],
     "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",
@@ -117,6 +105,17 @@
       "8983/tcp"
     ]
   },
+  {
+    "title": "Minio",
+    "description": "A distributed object storage server built for cloud applications and devops.",
+    "logo": "https://cloudinovasi.id/assets/img/logos/minio.png",
+    "image": "minio/minio:latest",
+    "ports": [
+      "9000/tcp"
+    ],
+    "volumes": ["/export", "/root/.minio"],
+    "command": "server /export"
+  },
   {
     "title": "Redis",
     "description": "Open-source in-memory data structure store",