diff --git a/blueprints/commentoplusplus/docker-compose.yml b/blueprints/commentoplusplus/docker-compose.yml
new file mode 100644
index 0000000..fc555f3
--- /dev/null
+++ b/blueprints/commentoplusplus/docker-compose.yml
@@ -0,0 +1,25 @@
+version: "3"
+
+services:
+  commentoplusplus:
+    image: caroga/commentoplusplus:v1.8.7
+    ports:
+      - "8080"
+    environment:
+      - COMMENTO_ORIGIN=${COMMENTO_ORIGIN}
+      - COMMENTO_POSTGRES=${COMMENTO_POSTGRES}
+      - COMMENTO_ENABLE_WILDCARDS=true
+    depends_on:
+      - postgres
+
+  postgres:
+    image: postgres:11
+    environment:
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=${POSTGRES_DB}
+      - POSTGRES_USER=${POSTGRES_USER}
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+
+volumes:
+  postgres-data: 
\ No newline at end of file
diff --git a/blueprints/commentoplusplus/logo.png b/blueprints/commentoplusplus/logo.png
new file mode 100644
index 0000000..67f1c08
Binary files /dev/null and b/blueprints/commentoplusplus/logo.png differ
diff --git a/blueprints/commentoplusplus/template.toml b/blueprints/commentoplusplus/template.toml
new file mode 100644
index 0000000..e65d560
--- /dev/null
+++ b/blueprints/commentoplusplus/template.toml
@@ -0,0 +1,17 @@
+[variables]
+DOMAIN = "${domain}"
+POSTGRES_PASSWORD = "${password:16}"
+
+[config]
+[[config.domains]]
+serviceName = "commentoplusplus"
+port = 8080
+host = "${DOMAIN}"
+
+[config.env]
+COMMENTO_ORIGIN = "http://${DOMAIN}"
+COMMENTO_POSTGRES = "postgres://postgres:${POSTGRES_PASSWORD}@postgres:5432/postgres?sslmode=disable"
+COMMENTO_ENABLE_WILDCARDS = "true"
+POSTGRES_PASSWORD = "${POSTGRES_PASSWORD}" 
+POSTGRES_DB = "postgres"
+POSTGRES_USER = "postgres"