diff --git a/README.md b/README.md
index 4f0a639..ddd7d8e 100644
--- a/README.md
+++ b/README.md
@@ -304,6 +304,7 @@ A collection of delicious docker recipes.
 - [x] browserless/chrome
 - [x] certbot
 - [x] codercom/code-server
+- [ ] registry.gitlab.com/commento/commento
 - [x] confluentinc
   - [x] cp-kafka-mqtt
   - [x] cp-kafka-rest
diff --git a/commento/README.md b/commento/README.md
new file mode 100644
index 0000000..058eefa
--- /dev/null
+++ b/commento/README.md
@@ -0,0 +1,7 @@
+commento
+========
+
+[Commento][1] allows you to foster discussion on your website – if you have a blog,
+you can embed Commento if you want your readers to add comments.
+
+[1]: https://github.com/adtac/commento
diff --git a/commento/docker-compose.yml b/commento/docker-compose.yml
new file mode 100644
index 0000000..92a4ea5
--- /dev/null
+++ b/commento/docker-compose.yml
@@ -0,0 +1,27 @@
+version: "3.8"
+
+services:
+
+  commento:
+    image: registry.gitlab.com/commento/commento
+    ports:
+      - "8080:8080"
+    environment:
+      - COMMENTO_ORIGIN=http://commento.easypi.tv:8080
+      - COMMENTO_PORT=8080
+      - COMMENTO_POSTGRES=postgres://commento:commento@postgres:5432/commento?sslmode=disable
+    depends_on:
+      - postgres
+    restart: unless-stopped
+
+  postgres:
+    image: postgres:alpine
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=commento
+      - POSTGRES_PASSWORD=commento
+      - POSTGRES_DB=commento
+    restart: unless-stopped
diff --git a/frp/Dockerfile b/frp/Dockerfile
index 55751e6..0f73db6 100644
--- a/frp/Dockerfile
+++ b/frp/Dockerfile
@@ -5,7 +5,7 @@
 FROM alpine:3
 MAINTAINER EasyPi Software Foundation
 
-ENV FRP_VERSION=0.37.1
+ENV FRP_VERSION=0.38.0
 ENV FRP_FILE=frp_${FRP_VERSION}_linux_amd64.tar.gz
 ENV FRP_URL=https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/${FRP_FILE}
 
diff --git a/frp/arm/Dockerfile b/frp/arm/Dockerfile
index ffae249..c404f4c 100644
--- a/frp/arm/Dockerfile
+++ b/frp/arm/Dockerfile
@@ -5,7 +5,7 @@
 FROM alpine:3
 MAINTAINER EasyPi Software Foundation
 
-ENV FRP_VERSION=0.37.1
+ENV FRP_VERSION=0.38.0
 ENV FRP_FILE=frp_${FRP_VERSION}_linux_arm.tar.gz
 ENV FRP_URL=https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/${FRP_FILE}
 
diff --git a/postgres/docker-compose.yml b/postgres/docker-compose.yml
index 226c40c..283c0d9 100644
--- a/postgres/docker-compose.yml
+++ b/postgres/docker-compose.yml
@@ -1,11 +1,13 @@
-postgres:
-  image: postgres:13-alpine
-  ports:
-    - "5432:5432"
-  volumes:
-    - ./data:/var/lib/postgresql/data
-  environment:
-    - POSTGRES_USER=postgres
-    - POSTGRES_PASSWORD=postgres
-    - POSTGRES_DB=postgres
-  restart: unless-stopped
+version: "3.8"
+services:
+  postgres:
+    image: postgres:alpine
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DB=postgres
+    restart: unless-stopped