diff --git a/wiki/docker-images/awesometechnologies_-_synapse-admin.md b/wiki/docker-images/awesometechnologies_-_synapse-admin.md
index eae8ead..0768954 100644
--- a/wiki/docker-images/awesometechnologies_-_synapse-admin.md
+++ b/wiki/docker-images/awesometechnologies_-_synapse-admin.md
@@ -1,6 +1,5 @@
 # awesometechnologies - synapse-admin
 
-
 This is a docker container for a Synapse server of [Matrix](../matrix.md).
 The official container and documentation was made by
 [awesometechnologies](https://hub.docker.com/awesometechnologies/synapse-admin).
diff --git a/wiki/docker-images/chocobozzz_-_peertube.md b/wiki/docker-images/chocobozzz_-_peertube.md
new file mode 100644
index 0000000..5aa5aeb
--- /dev/null
+++ b/wiki/docker-images/chocobozzz_-_peertube.md
@@ -0,0 +1,120 @@
+# chocobozz - peertube
+
+This is a docker container for a [PeerTube](../peertube.md) server.
+The official container and documentation was made by
+[chocobozz](https://github.com/chocobozzz/peertube).
+This docker-rebuild is made up by a `docker-compose.yml` file.
+In addition to the main container you need to connect a
+[redis container](./redis.md) to it.
+
+## Set-up
+
+Create the files `rebuild.sh`, `.env` and `docker-compose.yml` at the same
+place.
+Change the settings according to your needs and run `./rebuild.sh` afterwards.
+
+## Ports
+
+Set the following ports in the `ports:` section.
+
+| Container Port | Recommended outside port | Protocol | Description |
+| -------------- | ------------------------ | -------- | ----------- |
+| `9000`         | `9000`                   | TCP      | WebUI       |
+
+## Volumes
+
+Set the following volumes with the -v tag.
+
+| Outside mount/volume name | Container mount            | Description            |
+| ------------------------- | -------------------------- | ---------------------- |
+| `assets`                  | `/app/client/dist`         | storage for icons, etc |
+| `config`                  | `/config`                  | configuration data     |
+| `data`                    | `/data`                    | further data storage   |
+
+
+## rebuild.sh
+
+```shell
+#!/bin/sh
+docker-compose down
+docker-compose up -d
+```
+
+## .env
+
+```txt
+TZ="Europe/Berlin"
+
+PT_INITIAL_ROOT_PASSWORD=<root password>
+PEERTUBE_ADMIN_EMAIL=<admin email>
+PEERTUBE_WEBSERVER_HOSTNAME=<domain>
+PEERTUBE_WEBSERVER_PORT=<port>
+
+
+
+POSTGRES_USER=peertube
+POSTGRES_PASSWORD=<postgres password>
+POSTGRES_DB=peertube
+
+
+
+PEERTUBE_DB_USERNAME=peertube
+PEERTUBE_DB_PASSWORD=<db password>
+PEERTUBE_DB_SSL=false
+PEERTUBE_DB_HOSTNAME=postgres
+
+PEERTUBE_TRUST_PROXY=["127.0.0.1", "loopback", "172.18.0.0/16"]
+
+#  E-mail configuration
+PEERTUBE_SMTP_USERNAME=<smtp email>
+PEERTUBE_SMTP_PASSWORD=<smtp password>
+PEERTUBE_SMTP_HOSTNAME=mail.<domain>
+PEERTUBE_SMTP_PORT=587
+PEERTUBE_SMTP_FROM=<smtp email>
+PEERTUBE_SMTP_TLS=false
+PEERTUBE_SMTP_DISABLE_STARTTLS=false
+```
+
+## docker-compose.yml
+
+```yml
+version: "3.3"
+
+services:
+
+  peertube:
+    image: chocobozzz/peertube:production-bullseye
+    ports:
+        - "9000:9000"
+    env_file:
+      - .env
+    volumes:
+      - assets:/app/client/dist
+      - data:/data
+      - config:/config
+    depends_on:
+      - postgres
+      - redis
+    restart: unless-stopped
+
+  postgres:
+    image: postgres:13-alpine
+    env_file:
+      - .env
+    volumes:
+      - db:/var/lib/postgresql/data
+    restart: unless-stopped
+
+  redis:
+    image: redis:6-alpine
+    volumes:
+      - redis:/data
+    restart: unless-stopped
+
+volumes:
+  assets:
+  data:
+  config:
+  db:
+  redis:
+```
diff --git a/wiki/docker-images/iv-org_-_invidious.md b/wiki/docker-images/iv-org_-_invidious.md
index 9782999..7837bb8 100755
--- a/wiki/docker-images/iv-org_-_invidious.md
+++ b/wiki/docker-images/iv-org_-_invidious.md
@@ -4,6 +4,8 @@ This is a docker container for [Invidious](../invidious.md).
 The official container and documentation was made by [invidious](https://github.com/iv-org/invidious).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 There is no official pre-build on docker-hub.
+In addition to the main container you need to connect a
+[postgres container](./postgres.md) to it.
 
 ## Set-up
 
diff --git a/wiki/docker-images/wallabag_-_wallabag.md b/wiki/docker-images/wallabag_-_wallabag.md
index ec12678..79df5b4 100644
--- a/wiki/docker-images/wallabag_-_wallabag.md
+++ b/wiki/docker-images/wallabag_-_wallabag.md
@@ -92,12 +92,6 @@ services:
       - MYSQL_ROOT_PASSWORD=wallaroot
     volumes:
       - /opt/wallabag/data:/var/lib/mysql
-  db:
-    image: mariadb
-    environment:
-      - MYSQL_ROOT_PASSWORD=wallaroot
-    volumes:
-      - /opt/wallabag/data:/var/lib/mysql
   redis:
     image: redis:alpine
     volumes:
diff --git a/wiki/peertube.md b/wiki/peertube.md
new file mode 100644
index 0000000..0bfb521
--- /dev/null
+++ b/wiki/peertube.md
@@ -0,0 +1,9 @@
+# PeerTube
+
+[PeerTube](https://joinpeertube.org/) is a free and decentralized video
+platform using WebTorrent.
+
+## Server
+
+A server can be setup via docker with the
+[chocobozzz image](./docker-images/chocobozzz_-_peertube.md).
diff --git a/wiki/recommended_alternatives.md b/wiki/recommended_alternatives.md
index 0e1b91c..87ad377 100644
--- a/wiki/recommended_alternatives.md
+++ b/wiki/recommended_alternatives.md
@@ -51,6 +51,8 @@ recommended, good software (mostly free and/or open-source).
   Invidious features local subscription management.
   - [NewPipe](https://newpipe.net/) is an free and open-source android youtube client.
   NewPipe features local subscription management.
+  - [PeerTube](./peertube.md) is a free and decentralized video platform.
+  Creators that are on YouTube are not neccessarily on PeerTube and vice versa.
 
 - [**Google**](https://google.com) is a search engine.
   - [Searx](./searx.md) is a self-hostable meta-search engine.