diff --git a/wiki/docker-images/mailserver_-_docker-mailserver.md b/wiki/docker-images/mailserver_-_docker-mailserver.md
new file mode 100644
index 0000000..36d19f2
--- /dev/null
+++ b/wiki/docker-images/mailserver_-_docker-mailserver.md
@@ -0,0 +1,39 @@
+# mailserver - docker-mailserver
+
+The official container and documentation was made by [mailserver](https://hub.docker.com/r/mailserver/docker-mailserver).
+It contains dovecot, antispam, antivirus, ssl, etc.
+
+The configuration is done automatically using scripts by mailserver.
+First you need to download the essential setup files.
+
+```shell
+wget -O .env https://raw.githubusercontent.com/docker-mailserver/docker-mailserver/master/compose.env
+wget https://raw.githubusercontent.com/docker-mailserver/docker-mailserver/master/docker-compose.yml
+wget https://raw.githubusercontent.com/docker-mailserver/docker-mailserver/master/mailserver.env
+wget https://raw.githubusercontent.com/docker-mailserver/docker-mailserver/v9.0.1/setup.sh
+chmod a+x ./setup.sh
+```
+
+After that you need to edit the `.env` and the `mailserver.env<>` files to
+configure the mailserver.
+
+You then need to start the container with the `rebuild.sh` and add email
+accounts using the following command.
+
+`./setup.sh email add <user@domain> (<password>)`
+`./setup.sh alias add postmaster@<domain> <user@domain>`
+
+And finally generate the DCIM keys and rebuild once again.
+
+`./setup.sh config dkim`
+
+Afterwards you're ready to go by once again running the `rebuild.sh` file.
+
+## Rebuild
+
+```shell
+#!/bin/sh
+docker-compose down
+docker pull mailserver/docker-mailserver:latest
+docker-compose up -d
+```
diff --git a/wiki/docker-images/tvial_-_docker-mailserver.md b/wiki/docker-images/tvial_-_docker-mailserver.md
deleted file mode 100644
index fa88f99..0000000
--- a/wiki/docker-images/tvial_-_docker-mailserver.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# tvial - docker-mailserver
-
-The official container and documentation was made by [tvial](https://hub.docker.com/r/tvial/docker-mailserver).
-It contains dovecot, antispam, antivirus, ssl, etc.
-
-The configuration is done automatically using scripts by tvial.
-First you need to download the essential setup files.
-
-```shell
-curl -o setup.sh https://raw.githubusercontent.com/tomav/docker-mailserver/master/setup.sh; chmod a+x ./setup.sh
-curl -o docker-compose.yml https://raw.githubusercontent.com/tomav/docker-mailserver/master/docker-compose.yml.dist
-curl -o .env https://raw.githubusercontent.com/tomav/docker-mailserver/master/.env.dist
-curl -o env-mailserver https://raw.githubusercontent.com/tomav/docker-mailserver/master/env-mailserver.dist
-```
-
-After that you need to edit the `.env` and the `env-mailserver` files to
-configure the mailserver.
-
-You then need to start the container with the `rebuild.sh` and add email
-accounts using the following command.
-
-`./setup.sh email add <user@domain> (<password>)`
-
-And finally generate the DCIM keys and rebuild once again.
-
-`./setup.sh config dkim`
-
-Afterwards you're ready to go by once again running the `rebuild.sh` file.
-
-## Rebuild
-
-```shell
-#!/bin/sh
-docker-compose down
-docker pull tvial/docker-mailserver:latest
-docker-compose up -d
-```