diff --git a/templates/docker-compose.md b/templates/docker-compose.md
index 258c73b..2ab7a70 100644
--- a/templates/docker-compose.md
+++ b/templates/docker-compose.md
@@ -7,7 +7,7 @@ This docker-rebuild is made up by a `docker-compose.yml` file.
 In addition to the main container you need to connect a
 [/additional containers needed/]() to it.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh`, `.env` and `docker-compose.yml` at the same
 place.
diff --git a/templates/docker.md b/templates/docker.md
index 98fdcc8..0f0bb96 100644
--- a/templates/docker.md
+++ b/templates/docker.md
@@ -4,7 +4,7 @@ This is a [Docker](/wiki/docker.md) container for a /service/ server.
 The official container and documentation was made by
 [/maintainer/]().
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterwards.
diff --git a/wiki/docker/actualbudget_-_actual-server.md b/wiki/docker/actualbudget_-_actual-server.md
index d18b57f..f1e40af 100644
--- a/wiki/docker/actualbudget_-_actual-server.md
+++ b/wiki/docker/actualbudget_-_actual-server.md
@@ -5,7 +5,7 @@ The official container and documentation was made by
 [actualbudget](https://actualbudget.org/docs/install/docker/).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh`, `docker-compose.yml` at the same
 place.
diff --git a/wiki/docker/alexjustesen_-_speedtest-tracker.md b/wiki/docker/alexjustesen_-_speedtest-tracker.md
index 2158c46..e538405 100644
--- a/wiki/docker/alexjustesen_-_speedtest-tracker.md
+++ b/wiki/docker/alexjustesen_-_speedtest-tracker.md
@@ -5,7 +5,7 @@ tracker.
 The official container and documentation was made by
 [alexjustesen](https://github.com/alexjustesen/speedtest-tracker).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/alexta69_-_metube.md b/wiki/docker/alexta69_-_metube.md
index 31b9486..e53110c 100644
--- a/wiki/docker/alexta69_-_metube.md
+++ b/wiki/docker/alexta69_-_metube.md
@@ -6,7 +6,7 @@ The official container and documentation was made by
 [alexta69](https://github.com/alexta69/metube).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/ankitects_-_syncserver.md b/wiki/docker/ankitects_-_syncserver.md
index c31bd42..95a91ee 100644
--- a/wiki/docker/ankitects_-_syncserver.md
+++ b/wiki/docker/ankitects_-_syncserver.md
@@ -9,7 +9,7 @@ The syncserver can be installed to handle the syncing of data in a self-hosted w
 It is described [on GitHub](https://github.com/ankitects/anki/tree/main/docs/syncserver) and can be
 setup via [Docker](/wiki/docker.md).
 
-## Set-up
+## Setup
 
 Due to the syncserver having to be set up manually first navigate to the
 [Anki syncserver GitHub subpage](/wiki/anki.md#setup-server).
diff --git a/wiki/docker/awesometechnologies_-_synapse-admin.md b/wiki/docker/awesometechnologies_-_synapse-admin.md
index 1fb8637..6f62260 100644
--- a/wiki/docker/awesometechnologies_-_synapse-admin.md
+++ b/wiki/docker/awesometechnologies_-_synapse-admin.md
@@ -6,7 +6,7 @@ The official container and documentation was made by
 [awesometechnologies](https://hub.docker.com/awesometechnologies/synapse-admin).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/axhilrex_-_podgrab.md b/wiki/docker/axhilrex_-_podgrab.md
index 19eb89b..5319d5e 100644
--- a/wiki/docker/axhilrex_-_podgrab.md
+++ b/wiki/docker/axhilrex_-_podgrab.md
@@ -5,7 +5,7 @@ server.
 The official container and documentation was made by
 [axhilrex](https://github.com/akhilrex/podgrab).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/b4bz_-_homer.md b/wiki/docker/b4bz_-_homer.md
index 5c37021..a459f1b 100644
--- a/wiki/docker/b4bz_-_homer.md
+++ b/wiki/docker/b4bz_-_homer.md
@@ -3,7 +3,7 @@
 This is a [Docker](/wiki/docker.md) container for a Homer static site.
 The official container and documentation was made by [b4bz](https://hub.docker.com/r/b4bz/homer).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Run `./rebuild.sh` afterward to create the volumes.
diff --git a/wiki/docker/bbilly1_-_tubearchivist.md b/wiki/docker/bbilly1_-_tubearchivist.md
index 8dc09e2..aa7bad7 100644
--- a/wiki/docker/bbilly1_-_tubearchivist.md
+++ b/wiki/docker/bbilly1_-_tubearchivist.md
@@ -5,7 +5,7 @@ server.
 The Server consists of 3 Docker containers, one is the TubeArchivist main server, another is a
 TubeArchivist specific version of Elasticsearch and one a [redis](/wiki/docker/redis.md) instance.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/benbusby_-_whoogle-search.md b/wiki/docker/benbusby_-_whoogle-search.md
index b1a4d14..d8c7451 100644
--- a/wiki/docker/benbusby_-_whoogle-search.md
+++ b/wiki/docker/benbusby_-_whoogle-search.md
@@ -5,7 +5,7 @@ meta-search machine.
 The official container and documentation was made by
 [benbusby](https://github.com/benbusby/whoogle-search).
 
-## Set-up
+## Setup
 
 First of all create a folder for your `rebuild.sh`.
 After that clone whoogle from
diff --git a/wiki/docker/bilde2910_-_hauk.md b/wiki/docker/bilde2910_-_hauk.md
index ecac201..d8a2704 100644
--- a/wiki/docker/bilde2910_-_hauk.md
+++ b/wiki/docker/bilde2910_-_hauk.md
@@ -2,7 +2,7 @@
 
 This is a docker container for a [Hauk](/wiki/hauk.md).
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Additionally, create a `config.php` file based on the
diff --git a/wiki/docker/chocobozzz_-_peertube.md b/wiki/docker/chocobozzz_-_peertube.md
index 9af5e66..5a54d83 100644
--- a/wiki/docker/chocobozzz_-_peertube.md
+++ b/wiki/docker/chocobozzz_-_peertube.md
@@ -7,7 +7,7 @@ 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](/wiki/docker/redis.md) to
 it.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh`, `.env` and `docker-compose.yml` at the same
 place.
diff --git a/wiki/docker/cloudrac3r_-_bibliogram.md b/wiki/docker/cloudrac3r_-_bibliogram.md
index 602cd26..c5b04d8 100755
--- a/wiki/docker/cloudrac3r_-_bibliogram.md
+++ b/wiki/docker/cloudrac3r_-_bibliogram.md
@@ -6,7 +6,7 @@ The official container and documentation was made by
 [cloudrac3r](https://github.com/cloudrac3r/bibliogram).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 
-## Set-up
+## Setup
 
 First of all create a folder for your `rebuild.sh`.
 After that clone bibliogram from [sr.ht](https://sr.ht/~cadence/bibliogram/) into
diff --git a/wiki/docker/coturn_-_coturn.md b/wiki/docker/coturn_-_coturn.md
index 2fcdf4a..19baf90 100644
--- a/wiki/docker/coturn_-_coturn.md
+++ b/wiki/docker/coturn_-_coturn.md
@@ -6,7 +6,7 @@ The official container and documentation was made by
 [coturn](https://github.com/coturn/coturn).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh`, `data/matrix/coturn/turnserver.conf` and `docker-compose.yml` at the
 same place.
diff --git a/wiki/docker/dperson_-_torproxy.md b/wiki/docker/dperson_-_torproxy.md
index 505dc76..52b5c18 100644
--- a/wiki/docker/dperson_-_torproxy.md
+++ b/wiki/docker/dperson_-_torproxy.md
@@ -3,7 +3,7 @@
 This is a [Docker](/wiki/docker.md) container for a [Tor](/wiki/tor.md) proxy.
 The container and documentation was made by [dperson](https://hub.docker.com/r/dperson/torproxy).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/dyonr_-_jackettvpn.md b/wiki/docker/dyonr_-_jackettvpn.md
index 9ad2d04..abbb966 100644
--- a/wiki/docker/dyonr_-_jackettvpn.md
+++ b/wiki/docker/dyonr_-_jackettvpn.md
@@ -5,7 +5,7 @@ protected [Jackett](/wiki/jackett.md) server.
 The official container and documentation was made by
 [dyonr](https://github.com/DyonR/docker-Jackettvpn).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh` and set `<username>` and `<password>` according to
 your openvpn.
diff --git a/wiki/docker/dyonr_-_qbittorrentvpn.md b/wiki/docker/dyonr_-_qbittorrentvpn.md
index a4fb1c8..110a0ed 100644
--- a/wiki/docker/dyonr_-_qbittorrentvpn.md
+++ b/wiki/docker/dyonr_-_qbittorrentvpn.md
@@ -6,7 +6,7 @@ an [openVPN tunnel](/wiki/openvpn.md).
 The official container and documentation was made by
 [dyonr](https://github.com/DyonR/docker-qbittorrentvpn).
 
-## Set-up
+## Setup
 
 Create a `rebuild.sh` from the given examples – either for [OpenVPN](#openvpn-rebuildsh) or
 [Wireguard](#wireguard-rebuildsh), depending on the desired VPN protocol.
diff --git a/wiki/docker/gitea_-_gitea.md b/wiki/docker/gitea_-_gitea.md
index f49053f..68eed75 100644
--- a/wiki/docker/gitea_-_gitea.md
+++ b/wiki/docker/gitea_-_gitea.md
@@ -5,7 +5,7 @@ The Server consists of 2 Docker containers, one is the gitea main server and one
 In addition to the main container you need to connect a [mySQL container](/wiki/docker/mysql.md) to
 it.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/gramps-project_-_grampsweb.md b/wiki/docker/gramps-project_-_grampsweb.md
index 9595d35..37fb995 100644
--- a/wiki/docker/gramps-project_-_grampsweb.md
+++ b/wiki/docker/gramps-project_-_grampsweb.md
@@ -5,7 +5,7 @@ server.
 The Server consists of 2 Docker containers, one is the gramps main server – split into two
 subcontainers – and one a [redis instance](/wiki/docker/redis.md).
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/grimsi_-_gameyfin.md b/wiki/docker/grimsi_-_gameyfin.md
index d315172..bd27419 100644
--- a/wiki/docker/grimsi_-_gameyfin.md
+++ b/wiki/docker/grimsi_-_gameyfin.md
@@ -2,7 +2,7 @@
 
 This is a [Docker](/wiki/docker.md) container for a [Gameyfin](/wiki/game/gameyfin.md).
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs.
diff --git a/wiki/docker/haugene_-_transmission-openvpn.md b/wiki/docker/haugene_-_transmission-openvpn.md
index 2b5f733..ce5e1f5 100644
--- a/wiki/docker/haugene_-_transmission-openvpn.md
+++ b/wiki/docker/haugene_-_transmission-openvpn.md
@@ -6,7 +6,7 @@ an [openVPN tunnel](/wiki/openvpn.md).
 The official container and documentation was made by
 [haugene](https://github.com/haugene/docker-transmission-openvpn).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 To see which providers are supported take a look at the
diff --git a/wiki/docker/henrywhitaker3_-_speedtest-tracker.md b/wiki/docker/henrywhitaker3_-_speedtest-tracker.md
index 82e72be..4b38a1a 100644
--- a/wiki/docker/henrywhitaker3_-_speedtest-tracker.md
+++ b/wiki/docker/henrywhitaker3_-_speedtest-tracker.md
@@ -5,7 +5,7 @@ tracker.
 The official container and documentation was made by
 [henrywhitaker3](https://hub.docker.com/r/henrywhitaker3/speedtest-tracker).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/homeassistant_-_home-assistant.md b/wiki/docker/homeassistant_-_home-assistant.md
index a1f3f8f..e752aa8 100644
--- a/wiki/docker/homeassistant_-_home-assistant.md
+++ b/wiki/docker/homeassistant_-_home-assistant.md
@@ -5,7 +5,7 @@ server.
 The official container and documentation was made by
 [homeassistant](https://hub.docker.com/r/homeassistant/home-assistant).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/immich-app_-_immich-server.md b/wiki/docker/immich-app_-_immich-server.md
index c720f68..2d3bb32 100644
--- a/wiki/docker/immich-app_-_immich-server.md
+++ b/wiki/docker/immich-app_-_immich-server.md
@@ -7,7 +7,7 @@ This docker-rebuild is made up by a `docker-compose.yml` file.
 In addition to the main container you need to connect a
 [redis](/wiki/docker/redis.md) and a [postgres](/wiki/docker/postgres.md) container to it.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh`, `.env` and `docker-compose.yml` at the same
 place.
diff --git a/wiki/docker/itzg_-_minecraft-server.md b/wiki/docker/itzg_-_minecraft-server.md
index a1cddda..39ab671 100755
--- a/wiki/docker/itzg_-_minecraft-server.md
+++ b/wiki/docker/itzg_-_minecraft-server.md
@@ -5,7 +5,7 @@ This is a [Docker](/wiki/docker.md) container for a
 The container and documentation was made by
 [itzg](https://hub.docker.com/r/itzg/minecraft-server).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/iv-org_-_invidious.md b/wiki/docker/iv-org_-_invidious.md
index 27bda07..7c955c4 100755
--- a/wiki/docker/iv-org_-_invidious.md
+++ b/wiki/docker/iv-org_-_invidious.md
@@ -8,7 +8,7 @@ There is no official pre-build on docker-hub.
 In addition to the main container you need to connect a
 [postgres container](/wiki/docker/postgres.md) to it.
 
-## Set-up
+## Setup
 
 First of all create a folder for your `rebuild.sh`.
 After that clone invidious from [GitHub](https://github.com/iv-org/invidious) into a folder within
diff --git a/wiki/docker/jkarlos_-_git-server-docker.md b/wiki/docker/jkarlos_-_git-server-docker.md
index a0174ec..6605e77 100644
--- a/wiki/docker/jkarlos_-_git-server-docker.md
+++ b/wiki/docker/jkarlos_-_git-server-docker.md
@@ -4,7 +4,7 @@ This is a [Docker](/wiki/docker.md) container for a [git](/wiki/git_%28general%2
 The official container and documentation was made by
 [jkarlos](https://hub.docker.com/r/jkarlos/git-server-docker).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/johnktims_-_folding-at-home.md b/wiki/docker/johnktims_-_folding-at-home.md
index 02f71f9..56315de 100644
--- a/wiki/docker/johnktims_-_folding-at-home.md
+++ b/wiki/docker/johnktims_-_folding-at-home.md
@@ -5,7 +5,7 @@ This is a [Docker](/wiki/docker.md) container for
 The official container and documentation was made by
 [johnktims](https://hub.docker.com/r/johnktims/folding-at-home).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/kiwix_-_kiwix-serve.md b/wiki/docker/kiwix_-_kiwix-serve.md
index 58a051e..da24daf 100644
--- a/wiki/docker/kiwix_-_kiwix-serve.md
+++ b/wiki/docker/kiwix_-_kiwix-serve.md
@@ -4,7 +4,7 @@ This is a [Docker](/wiki/docker.md) container for a [Kiwix](/wiki/kiwix.md) serv
 The official container and documentation was made by
 [kiwix](https://github.com/kiwix/kiwix-tools/pkgs/container/kiwix-serve).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Make sure to place the `.zim` files inside the volume.
diff --git a/wiki/docker/kohakuhub_-_kohakuhub.md b/wiki/docker/kohakuhub_-_kohakuhub.md
index 2fb5735..fd0a0c5 100644
--- a/wiki/docker/kohakuhub_-_kohakuhub.md
+++ b/wiki/docker/kohakuhub_-_kohakuhub.md
@@ -6,7 +6,7 @@ The Server consists of multiple Docker containers.
 These are containers for the KohakuHub API and – depending on configuration – MinIO, LakeFS,
 [Postgres](/wiki/docker/postgres.md)
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 The file `docker-compose.yml` is usually created automatically.
diff --git a/wiki/docker/kylemanna_-_openvpn.md b/wiki/docker/kylemanna_-_openvpn.md
index cd6614c..55f406f 100644
--- a/wiki/docker/kylemanna_-_openvpn.md
+++ b/wiki/docker/kylemanna_-_openvpn.md
@@ -5,7 +5,7 @@ This is a [Docker](/wiki/docker.md) container for an
 The official container and documentation was made by
 [kylemanna](https://hub.docker.com/r/kylemanna/openvpn).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs.
diff --git a/wiki/docker/linuxserver_-_airsonic-advanced.md b/wiki/docker/linuxserver_-_airsonic-advanced.md
index a83d040..ead66dc 100644
--- a/wiki/docker/linuxserver_-_airsonic-advanced.md
+++ b/wiki/docker/linuxserver_-_airsonic-advanced.md
@@ -5,7 +5,7 @@ This is a [Docker](/wiki/docker.md) container for a
 The official container and documentation was made by
 [linuxserver](https://github.com/linuxserver/docker-airsonic-advanced).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/linuxserver_-_airsonic.md b/wiki/docker/linuxserver_-_airsonic.md
index 622aa12..785a57f 100644
--- a/wiki/docker/linuxserver_-_airsonic.md
+++ b/wiki/docker/linuxserver_-_airsonic.md
@@ -5,7 +5,7 @@ server.
 The official container and documentation was made by
 [linuxserver](https://hub.docker.com/r/linuxserver/airsonic).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/linuxserver_-_calibre-web.md b/wiki/docker/linuxserver_-_calibre-web.md
index 91a5997..99e6a2c 100644
--- a/wiki/docker/linuxserver_-_calibre-web.md
+++ b/wiki/docker/linuxserver_-_calibre-web.md
@@ -5,7 +5,7 @@ The official container and documentation was made by
 [linuxserver](https://github.com/linuxserver/docker-calibre-web).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/linuxserver_-_freshrss.md b/wiki/docker/linuxserver_-_freshrss.md
index e2c533e..4af5f3b 100644
--- a/wiki/docker/linuxserver_-_freshrss.md
+++ b/wiki/docker/linuxserver_-_freshrss.md
@@ -6,7 +6,7 @@ The official container and documentation was made by
 [linuxserver](https://docs.linuxserver.io/images/docker-freshrss).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/linuxserver_-_jellyfin.md b/wiki/docker/linuxserver_-_jellyfin.md
index bdddbb6..0edab90 100644
--- a/wiki/docker/linuxserver_-_jellyfin.md
+++ b/wiki/docker/linuxserver_-_jellyfin.md
@@ -6,7 +6,7 @@ The official container and documentation was made by
 [linuxserver](https://hub.docker.com/r/linuxserver/jellyfin).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/linuxserver_-_lidarr.md b/wiki/docker/linuxserver_-_lidarr.md
index 6e47e21..8291f24 100644
--- a/wiki/docker/linuxserver_-_lidarr.md
+++ b/wiki/docker/linuxserver_-_lidarr.md
@@ -5,7 +5,7 @@ server.
 The official container and documentation was made by
 [linuxserver](https://hub.docker.com/r/linuxserver/lidarr).
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/linuxserver_-_radarr.md b/wiki/docker/linuxserver_-_radarr.md
index d1ebb12..7ad136a 100644
--- a/wiki/docker/linuxserver_-_radarr.md
+++ b/wiki/docker/linuxserver_-_radarr.md
@@ -5,7 +5,7 @@ server.
 The official container and documentation was made by
 [linuxserver](https://hub.docker.com/r/linuxserver/radarr).
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/linuxserver_-_sonarr.md b/wiki/docker/linuxserver_-_sonarr.md
index adeb250..75e7527 100644
--- a/wiki/docker/linuxserver_-_sonarr.md
+++ b/wiki/docker/linuxserver_-_sonarr.md
@@ -5,7 +5,7 @@ server.
 The official container and documentation was made by
 [linuxserver](https://hub.docker.com/r/linuxserver/sonarr).
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/linuxserver_-_syncthing.md b/wiki/docker/linuxserver_-_syncthing.md
index 008a00b..784968b 100644
--- a/wiki/docker/linuxserver_-_syncthing.md
+++ b/wiki/docker/linuxserver_-_syncthing.md
@@ -5,7 +5,7 @@ This is a [Docker](/wiki/docker.md) container for syncthing for
 The official container and documentation was made by
 [linuxserver](https://hub.docker.com/r/linuxserver/syncthing).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/linuxserver_-_tvheadend.md b/wiki/docker/linuxserver_-_tvheadend.md
index 8db467c..b0b0fd2 100644
--- a/wiki/docker/linuxserver_-_tvheadend.md
+++ b/wiki/docker/linuxserver_-_tvheadend.md
@@ -5,7 +5,7 @@ server.
 The official container and documentation was made by
 [linuxserver](https://hub.docker.com/r/linuxserver/tvheadend).
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/linuxserver_-_wireguard.md b/wiki/docker/linuxserver_-_wireguard.md
index 97c837f..bdeb91f 100644
--- a/wiki/docker/linuxserver_-_wireguard.md
+++ b/wiki/docker/linuxserver_-_wireguard.md
@@ -5,7 +5,7 @@ This is a [Docker](/wiki/docker.md) container for a
 The official container and documentation was made by
 [linuxserver](https://hub.docker.com/r/linuxserver/wireguard).
 
-## Set-Up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs.
@@ -101,4 +101,4 @@ certificate.
 ### Add New Client to Existing WireGuard Installation
 
 To add a new client to the existing WireGuard installation increase the number
-of peers or append a peer to the list of peers specified in the [setup section](#set-up) section.
+of peers or append a peer to the list of peers specified in the [setup section](#setup) section.
diff --git a/wiki/docker/mailserver_-_docker-mailserver.md b/wiki/docker/mailserver_-_docker-mailserver.md
index ae71db9..170ad64 100644
--- a/wiki/docker/mailserver_-_docker-mailserver.md
+++ b/wiki/docker/mailserver_-_docker-mailserver.md
@@ -5,9 +5,9 @@ The official container and documentation was made by
 [mailserver](https://hub.docker.com/r/mailserver/docker-mailserver).
 It contains dovecot, antispam, antivirus, ssl and many more features.
 
-## Set-up
+## Setup
 
-This section addresses the set-up of the docker-mailserver [Docker](/wiki/docker.md) container.
+This section addresses the setup of the docker-mailserver [Docker](/wiki/docker.md) container.
 
 ### Download
 
@@ -151,7 +151,7 @@ No further setup is needed and [emails](/wiki/email.md) using the new domains ca
 
 After setting up the [Email](/wiki/email.md) server, some [Client](/wiki/email.md#client)
 configurations may be taken.
-Especially recommended is the set-up of
+Especially recommended is the setup of
 [end-to-end encryption](/wiki/email.md#end-to-end-encryption).
 
 ### rebuild.sh
diff --git a/wiki/docker/mariadb.md b/wiki/docker/mariadb.md
index ddbc1ed..7841829 100644
--- a/wiki/docker/mariadb.md
+++ b/wiki/docker/mariadb.md
@@ -5,7 +5,7 @@ The official container and documentation was made by [mariadb](https://hub.docke
 The Docker container is mainly used in combination with other containers.
 To achieve this in the easiest way use a docker-compose file.
 
-## Set-Up
+## Setup
 
 The mariadb Docker container is dependent on another container most of the time.
 The exact setup will be described in the regarding entry.
diff --git a/wiki/docker/massivedecks_-_client.md b/wiki/docker/massivedecks_-_client.md
index c4e5d56..9f5cd4a 100644
--- a/wiki/docker/massivedecks_-_client.md
+++ b/wiki/docker/massivedecks_-_client.md
@@ -9,7 +9,7 @@ This docker-rebuild is made up by a `docker-compose.yml` file.
 In addition to the client and server containers a [postgres container](/wiki/docker/postgres.md)
 needs to be connected.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh`, `.env` and `docker-compose.yml` at the same
 place.
diff --git a/wiki/docker/matrixdotorg_-_synapse.md b/wiki/docker/matrixdotorg_-_synapse.md
index 8e941c5..673c6e8 100644
--- a/wiki/docker/matrixdotorg_-_synapse.md
+++ b/wiki/docker/matrixdotorg_-_synapse.md
@@ -6,7 +6,7 @@ The official container and documentation was made by
 [matrixdotorg](https://hub.docker.com/matrixdotorg/synapse).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/mikenye_-_picard.md b/wiki/docker/mikenye_-_picard.md
index 7356662..761af8c 100644
--- a/wiki/docker/mikenye_-_picard.md
+++ b/wiki/docker/mikenye_-_picard.md
@@ -6,7 +6,7 @@ This is a [Docker](/wiki/docker.md) container for a
 The official container and documentation was made by
 [mikenye](https://github.com/mikenye/docker-picard).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/nextcloud.md b/wiki/docker/nextcloud.md
index fcd4d53..aa9780b 100644
--- a/wiki/docker/nextcloud.md
+++ b/wiki/docker/nextcloud.md
@@ -8,7 +8,7 @@ The services in this files are explained seperately.
 The main Docker container needs a database in form of a [MariaDB](/wiki/docker/mariadb.md)
 Docker container.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/nginx.md b/wiki/docker/nginx.md
index 2657809..fb761bc 100644
--- a/wiki/docker/nginx.md
+++ b/wiki/docker/nginx.md
@@ -6,7 +6,7 @@ The official container and documentation was made by
 [nginx](https://hub.docker.com/_/nginx).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/olbat_-_cupsd.md b/wiki/docker/olbat_-_cupsd.md
index 8d51c5e..416af2c 100644
--- a/wiki/docker/olbat_-_cupsd.md
+++ b/wiki/docker/olbat_-_cupsd.md
@@ -4,7 +4,7 @@ This is a [Docker](/wiki/docker.md) container for a [Cups](/wiki/cups.md) server
 The official container and documentation was made by
 [olbat](https://hub.docker.com/r/olbat/cupsd).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/ollama_-_ollama.md b/wiki/docker/ollama_-_ollama.md
index f63b57f..0e762c4 100644
--- a/wiki/docker/ollama_-_ollama.md
+++ b/wiki/docker/ollama_-_ollama.md
@@ -4,7 +4,7 @@ This is a [Docker](/wiki/docker.md) container for an ollama server.
 The official container and documentation was made by
 [ollama](https://hub.docker.com/r/ollama/ollama).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/open-webui_-_open-webui.md b/wiki/docker/open-webui_-_open-webui.md
index 564308e..315b76c 100644
--- a/wiki/docker/open-webui_-_open-webui.md
+++ b/wiki/docker/open-webui_-_open-webui.md
@@ -4,7 +4,7 @@ This is a [Docker](/wiki/docker.md) container for a Open WebUI server.
 The official container and documentation was made by
 [open-webui](https://github.com/open-webui/open-webui).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/owncloud.md b/wiki/docker/owncloud.md
index 27d3406..71277cd 100644
--- a/wiki/docker/owncloud.md
+++ b/wiki/docker/owncloud.md
@@ -7,7 +7,7 @@ The services in this files are explained seperately.
 The main Docker container needs a database in form of a [MariaDB](/wiki/docker/mariadb.md) Docker
 container.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/oznu_-_docker-cloudflare-ddns.md b/wiki/docker/oznu_-_docker-cloudflare-ddns.md
index 70b4931..b2b2138 100644
--- a/wiki/docker/oznu_-_docker-cloudflare-ddns.md
+++ b/wiki/docker/oznu_-_docker-cloudflare-ddns.md
@@ -5,7 +5,7 @@ cloudflare dns entries.
 The official container and documentation was made by
 [oznu](https://github.com/oznu/docker-cloudflare-ddns).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/oznu_-_onedrive.md b/wiki/docker/oznu_-_onedrive.md
index 298bdad..2324c77 100644
--- a/wiki/docker/oznu_-_onedrive.md
+++ b/wiki/docker/oznu_-_onedrive.md
@@ -3,7 +3,7 @@
 This is a docker container for a onedrive client.
 The official container and documentation was made by [oznu](https://hub.docker.com/r/oznu/onedrive).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/portainer_-_agent.md b/wiki/docker/portainer_-_agent.md
index 0345c1d..974ce53 100644
--- a/wiki/docker/portainer_-_agent.md
+++ b/wiki/docker/portainer_-_agent.md
@@ -5,7 +5,7 @@ agent.
 The official container and documentation was made by
 [portainer](https://hub.docker.com/r/portainer/agent).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/portainer_-_portainer.md b/wiki/docker/portainer_-_portainer.md
index 17d7977..b545b88 100644
--- a/wiki/docker/portainer_-_portainer.md
+++ b/wiki/docker/portainer_-_portainer.md
@@ -5,7 +5,7 @@ server.
 The official container and documentation was made by
 [portainer](https://hub.docker.com/r/portainer/portainer).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/prologic_-_golinks.md b/wiki/docker/prologic_-_golinks.md
index 35025bf..f8c7073 100644
--- a/wiki/docker/prologic_-_golinks.md
+++ b/wiki/docker/prologic_-_golinks.md
@@ -5,7 +5,7 @@ bookmarks, commands and aliases.
 The official container and documentation was made by
 [prologic](https://git.mills.io/prologic/golinks).
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/prologic_-_gopherproxy.md b/wiki/docker/prologic_-_gopherproxy.md
index 51dacef..1d7dfc1 100644
--- a/wiki/docker/prologic_-_gopherproxy.md
+++ b/wiki/docker/prologic_-_gopherproxy.md
@@ -4,7 +4,7 @@ This is a [Docker](/wiki/docker.md) container for a gopher to http proxy.
 The official container and documentation was made by
 [prologic](https://hub.docker.com/r/prologic/gopherproxy).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/prologic_-_todo.md b/wiki/docker/prologic_-_todo.md
index 762e855..3278065 100644
--- a/wiki/docker/prologic_-_todo.md
+++ b/wiki/docker/prologic_-_todo.md
@@ -4,7 +4,7 @@ This is a [Docker](/wiki/docker.md) container for a todo-manager.
 The official container and documentation was made by
 [prologic](https://hub.docker.com/r/prologic/todo).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/rblsb_-_synctube.md b/wiki/docker/rblsb_-_synctube.md
index 7975ac1..1cf2053 100644
--- a/wiki/docker/rblsb_-_synctube.md
+++ b/wiki/docker/rblsb_-_synctube.md
@@ -6,7 +6,7 @@ The official container and documentation was made by
 [rblsb](https://github.com/rblsb/synctube).
 There is no official pre-build on docker-hub.
 
-## Set-up
+## Setup
 
 First of all create a folder for your `rebuild.sh`.
 After that clone synctube from [GitHub](https://github.com/rblsb/synctube) into
diff --git a/wiki/docker/rlister_-_hastebin.md b/wiki/docker/rlister_-_hastebin.md
index 7b6bdaa..d8da2cb 100644
--- a/wiki/docker/rlister_-_hastebin.md
+++ b/wiki/docker/rlister_-_hastebin.md
@@ -4,7 +4,7 @@ This is a [Docker](/wiki/docker.md) container for a hastebin server.
 The official container and documentation was made by
 [rlister](https://hub.docker.com/r/rlister/hastebin).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/samba.md b/wiki/docker/samba.md
index 5530aea..625f123 100644
--- a/wiki/docker/samba.md
+++ b/wiki/docker/samba.md
@@ -5,7 +5,7 @@ server.
 The official container and documentation was made by
 [dperson](https://hub.docker.com/r/samba).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/searx_-_searx.md b/wiki/docker/searx_-_searx.md
index 28c41b2..04d98b4 100644
--- a/wiki/docker/searx_-_searx.md
+++ b/wiki/docker/searx_-_searx.md
@@ -5,7 +5,7 @@ meta-search machine.
 The official container and documentation was made by
 [searx](https://hub.docker.com/r/searx/searx).
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/sinusbot_-_docker.md b/wiki/docker/sinusbot_-_docker.md
index e95f04c..5ca22d5 100644
--- a/wiki/docker/sinusbot_-_docker.md
+++ b/wiki/docker/sinusbot_-_docker.md
@@ -3,7 +3,7 @@
 This is a [Docker](/wiki/docker.md) container for a [Sinusbot](/wiki/sinusbot.md).
 The Server consists of a single Docker container.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 
diff --git a/wiki/docker/sissbrueckner_-_linkding.md b/wiki/docker/sissbrueckner_-_linkding.md
index 4ae30d2..eaff067 100644
--- a/wiki/docker/sissbrueckner_-_linkding.md
+++ b/wiki/docker/sissbrueckner_-_linkding.md
@@ -5,7 +5,7 @@ bookmark and archive service.
 The official container and documentation was made by
 [sissbrueckner](https://github.com/sissbruecker/linkding).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/spikecodes_-_libreddit.md b/wiki/docker/spikecodes_-_libreddit.md
index 174dfab..2e9f31e 100755
--- a/wiki/docker/spikecodes_-_libreddit.md
+++ b/wiki/docker/spikecodes_-_libreddit.md
@@ -5,7 +5,7 @@ frontend [libreddit](/wiki/libreddit.md).
 The official container and documentation was made by
 [spikecodes](https://github.com/spikecodes/libreddit).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/teamspeak.md b/wiki/docker/teamspeak.md
index 3f3d7cb..7f5655d 100644
--- a/wiki/docker/teamspeak.md
+++ b/wiki/docker/teamspeak.md
@@ -5,7 +5,7 @@ This is a [Docker](/wiki/docker.md) container for a
 The official container and documentation was made by
 [Teamspeak](https://hub.docker.com/_/teamspeak).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/tetricz_-_mordhau-server.md b/wiki/docker/tetricz_-_mordhau-server.md
index 2d814fa..a2e493a 100644
--- a/wiki/docker/tetricz_-_mordhau-server.md
+++ b/wiki/docker/tetricz_-_mordhau-server.md
@@ -4,7 +4,7 @@ This is a [Docker](/wiki/docker.md) container for a mordhau server.
 The official container and documentation was made by
 [tetricz](https://hub.docker.com/r/tetricz/mordhau-server).
 
-## Set-up
+## Setup
 
 Create the files `start.sh` and `stop.sh`.
 Change the settings according to your needs and run `./start.sh` to start
diff --git a/wiki/docker/tombursch_-_kitchenowl.md b/wiki/docker/tombursch_-_kitchenowl.md
index 461b69a..4be9fa9 100644
--- a/wiki/docker/tombursch_-_kitchenowl.md
+++ b/wiki/docker/tombursch_-_kitchenowl.md
@@ -7,7 +7,7 @@ The official container and documentation was made by
 This docker-rebuild is made up by a `docker-compose.yml` file.
 The Server consists of two Docker containers, one is the kitchenowl frontend, another is a backend.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same
 place.
diff --git a/wiki/docker/tomsquest_-_docker-radicale.md b/wiki/docker/tomsquest_-_docker-radicale.md
index 91edab7..806cc1b 100644
--- a/wiki/docker/tomsquest_-_docker-radicale.md
+++ b/wiki/docker/tomsquest_-_docker-radicale.md
@@ -7,7 +7,7 @@ The official container and documentation was made by
 The `latest` tag at the moment of writing this readme was corrupted.
 The last usable tag was used therefore to guarantee best performance for all users.
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Create a volume with the name `radicale_config`.
diff --git a/wiki/docker/traefik.md b/wiki/docker/traefik.md
index f4024b7..a6bc5ab 100644
--- a/wiki/docker/traefik.md
+++ b/wiki/docker/traefik.md
@@ -5,7 +5,7 @@ The official container and documentation was made by
 [traefik](https://hub.docker.com/_/traefik).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 In that folder create the directories `data/config`.
diff --git a/wiki/docker/vabene1111_-_recipes.md b/wiki/docker/vabene1111_-_recipes.md
index bf36f18..d917446 100644
--- a/wiki/docker/vabene1111_-_recipes.md
+++ b/wiki/docker/vabene1111_-_recipes.md
@@ -8,7 +8,7 @@ This docker-rebuild is made up by a `docker-compose.yml` file.
 In addition to the main container you need to connect a
 [postgres container](/wiki/docker/postgres.md) to it.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh`, `.env` and `docker-compose.yml` at the same
 place.
diff --git a/wiki/docker/vectorim_-_riot-web.md b/wiki/docker/vectorim_-_riot-web.md
index 3d37d11..fa9fca1 100644
--- a/wiki/docker/vectorim_-_riot-web.md
+++ b/wiki/docker/vectorim_-_riot-web.md
@@ -6,7 +6,7 @@ The official container and documentation was made by
 [linuxserver](https://hub.docker.com/vectorim/riot-web).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/ventz_-_bind.md b/wiki/docker/ventz_-_bind.md
index 5a05494..a83bac8 100644
--- a/wiki/docker/ventz_-_bind.md
+++ b/wiki/docker/ventz_-_bind.md
@@ -5,7 +5,7 @@ This is a [Docker](/wiki/docker.md) container for a [bind](/wiki/bind.md)
 The official container and documentation was made by
 [ventz](https://hub.docker.com/r/ventz/bind).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/viperproject_-_viperserver.md b/wiki/docker/viperproject_-_viperserver.md
index 4e49479..03f6f23 100644
--- a/wiki/docker/viperproject_-_viperserver.md
+++ b/wiki/docker/viperproject_-_viperserver.md
@@ -6,7 +6,7 @@ server, which is used for building the Viper verifiers
 The official container and documentation was made by
 [viperproject](https://hub.docker.com/r/viperproject/viperserver).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/wabayang_-_jelu.md b/wiki/docker/wabayang_-_jelu.md
index a169753..1b86591 100644
--- a/wiki/docker/wabayang_-_jelu.md
+++ b/wiki/docker/wabayang_-_jelu.md
@@ -5,7 +5,7 @@ The official container and documentation was made by
 [wabayang](https://github.com/bayang/jelu).
 This docker-rebuild is made up by a `docker-compose.yml` file.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/wallabag_-_wallabag.md b/wiki/docker/wallabag_-_wallabag.md
index ede1eab..12f6600 100644
--- a/wiki/docker/wallabag_-_wallabag.md
+++ b/wiki/docker/wallabag_-_wallabag.md
@@ -6,7 +6,7 @@ one a Redis instance.
 In addition to the main container you need to connect a
 [mariadb container](/wiki/docker/mariadb.md) and a [redis container](/wiki/docker/redis.md) to it.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/xy2z_-_pinedocs.md b/wiki/docker/xy2z_-_pinedocs.md
index a6c3971..bc59d17 100644
--- a/wiki/docker/xy2z_-_pinedocs.md
+++ b/wiki/docker/xy2z_-_pinedocs.md
@@ -4,7 +4,7 @@ This is a [Docker](/wiki/docker.md) container for the file viewer pinedocs.
 The official container and documentation was made by
 [xy2z](https://hub.docker.com/r/xy2z/pinedocs).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/yourls.md b/wiki/docker/yourls.md
index d48781d..a422b54 100644
--- a/wiki/docker/yourls.md
+++ b/wiki/docker/yourls.md
@@ -5,7 +5,7 @@ The official container and documentation was made by [YOURLS](https://hub.docker
 In addition to the main container you need to connect a [mySQL container](/wiki/docker/mysql.md) to
 it.
 
-## Set-up
+## Setup
 
 Create the files `rebuild.sh` and `docker-compose.yml` at the same place.
 Change the settings according to your needs and run `./rebuild.sh` afterward.
diff --git a/wiki/docker/zedeus_-_nitter.md b/wiki/docker/zedeus_-_nitter.md
index e4eac88..dfb5486 100755
--- a/wiki/docker/zedeus_-_nitter.md
+++ b/wiki/docker/zedeus_-_nitter.md
@@ -5,7 +5,7 @@ frontend [nitter](/wiki/nitter.md).
 The official container and documentation was made by
 [zedeus](https://github.com/zedeus/nitter).
 
-## Set-up
+## Setup
 
 Create the file `rebuild.sh`, `docker-compose.yml` and `nitter.conf` at the same
 place.
diff --git a/wiki/email.md b/wiki/email.md
index 6e2df14..3b5eb68 100644
--- a/wiki/email.md
+++ b/wiki/email.md
@@ -65,7 +65,7 @@ mail._domainkey.<domain>.    TXT    "v=DKIM1; h=sha256; k=rsa; p=<public-key>"
 The key has to be retrieved from the mail server.
 For example for [docker-mailserver](/wiki/docker/mailserver_-_docker-mailserver.md) the process is
 described in the
-[corresponding set-up section](/wiki/docker/mailserver_-_docker-mailserver.md#set-up).
+[corresponding setup section](/wiki/docker/mailserver_-_docker-mailserver.md#setup).
 
 #### DMARC record
 
diff --git a/wiki/openvpn.md b/wiki/openvpn.md
index 761427c..36afa3c 100644
--- a/wiki/openvpn.md
+++ b/wiki/openvpn.md
@@ -4,7 +4,7 @@
 
 ## Set up
 
-In the following sections the different set-ups of OpenVPN usages are described.
+In the following sections the different setups of OpenVPN usages are described.
 
 ### Server