diff --git a/wiki/*arr.md b/wiki/*arr.md
index 9293761..e6f5a46 100644
--- a/wiki/*arr.md
+++ b/wiki/*arr.md
@@ -13,9 +13,9 @@ These applications include but are not limited to
 
 For the different applications there are different [Docker](/wiki/docker.md)
 containers for setup:
-[Linuxservers Sonarr image](/wiki/docker-images/linuxserver_-_sonarr.md),
-[Linuxservers Radarr image](/wiki/docker-images/linuxserver_-_radarr.md) and
-[Linuxservers Lidarr image](/wiki/docker-images/linuxserver_-_lidarr.md).
+[Linuxservers Sonarr image](/wiki/docker/linuxserver_-_sonarr.md),
+[Linuxservers Radarr image](/wiki/docker/linuxserver_-_radarr.md) and
+[Linuxservers Lidarr image](/wiki/docker/linuxserver_-_lidarr.md).
 
 ### Initial Configuration
 
diff --git a/wiki/airsonic-advanced.md b/wiki/airsonic-advanced.md
index dafd310..bf38ab1 100644
--- a/wiki/airsonic-advanced.md
+++ b/wiki/airsonic-advanced.md
@@ -9,7 +9,7 @@ is a fork of [Subsonic](./subsonic.md).
 ## Setup
 
 The software can be setup via docker with the
-[linuxserver image](./docker-images/linuxserver_-_airsonic-advanced.md).
+[linuxserver image](./docker/linuxserver_-_airsonic-advanced.md).
 
 ### Initial configuration
 
diff --git a/wiki/airsonic.md b/wiki/airsonic.md
index d35d51a..c3fa7d6 100644
--- a/wiki/airsonic.md
+++ b/wiki/airsonic.md
@@ -10,7 +10,7 @@ A more modern implementation of it is
 ## Set up
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[linuxserver image](./docker-images/linuxserver_-_airsonic.md).
+[linuxserver image](./docker/linuxserver_-_airsonic.md).
 
 ### Clients
 
diff --git a/wiki/bibliogram.md b/wiki/bibliogram.md
index 99a53dc..40ca584 100644
--- a/wiki/bibliogram.md
+++ b/wiki/bibliogram.md
@@ -9,7 +9,7 @@ as it is not possible anymore to show user pages but only single posts.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[cloudrac3r image](./docker-images/cloudrac3r_-_bibliogram.md).
+[cloudrac3r image](./docker/cloudrac3r_-_bibliogram.md).
 
 ## Automatic redirect from Instagram
 
diff --git a/wiki/bind.md b/wiki/bind.md
index 968ddc6..02a1ef1 100644
--- a/wiki/bind.md
+++ b/wiki/bind.md
@@ -6,7 +6,7 @@ interacting with the [DNS](./dns.md).
 ## Setup
 
 The software can be setup via docker with the
-[ventz image](./docker-images/ventz_-_bind.md).
+[ventz image](./docker/ventz_-_bind.md).
 
 ## Usage
 
diff --git a/wiki/cups.md b/wiki/cups.md
index 66ff8b4..7580546 100644
--- a/wiki/cups.md
+++ b/wiki/cups.md
@@ -6,7 +6,7 @@ unix and unix-like systems.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[linuxserver image](./docker-images/linuxserver_-_airsonic.md).
+[linuxserver image](./docker/linuxserver_-_airsonic.md).
 Additionally to this a client is needed on the system that need access to the
 server software.
 
diff --git a/wiki/databases.md b/wiki/databases.md
index 1ff3c33..14339aa 100644
--- a/wiki/databases.md
+++ b/wiki/databases.md
@@ -5,5 +5,5 @@ Most prominent type of database are SQL databases.
 
 ## Database management systems (DBMS)
 
-- [MySQL](./docker-images/mysql.md) is a relational DBMS
-- [MariaDB](./docker-images/mariadb.md) is a relational DBMS that is a fork of MySQL
+- [MySQL](./docker/mysql.md) is a relational DBMS
+- [MariaDB](./docker/mariadb.md) is a relational DBMS that is a fork of MySQL
diff --git a/wiki/docker.md b/wiki/docker.md
index 8f6438b..b2e3e6b 100644
--- a/wiki/docker.md
+++ b/wiki/docker.md
@@ -32,7 +32,7 @@ After that relog into your machine and you should be able to run
 The programs below are useful docker-management systems in different style.
 
 - [ctop](https://github.com/bcicen/ctop): top-like cli interface for containers
-- [portainer](./docker-images/portainer.md): web ui for managing docker and kubernetes
+- [portainer](./docker/portainer.md): web ui for managing docker and kubernetes
 
 ### Enable Nvidia GPUs
 
diff --git a/wiki/docker-images/alexta69_-_metube.md b/wiki/docker/alexta69_-_metube.md
similarity index 100%
rename from wiki/docker-images/alexta69_-_metube.md
rename to wiki/docker/alexta69_-_metube.md
diff --git a/wiki/docker-images/awesometechnologies_-_synapse-admin.md b/wiki/docker/awesometechnologies_-_synapse-admin.md
similarity index 100%
rename from wiki/docker-images/awesometechnologies_-_synapse-admin.md
rename to wiki/docker/awesometechnologies_-_synapse-admin.md
diff --git a/wiki/docker-images/axhilrex_-_podgrab.md b/wiki/docker/axhilrex_-_podgrab.md
similarity index 100%
rename from wiki/docker-images/axhilrex_-_podgrab.md
rename to wiki/docker/axhilrex_-_podgrab.md
diff --git a/wiki/docker-images/b4bz_-_homer.md b/wiki/docker/b4bz_-_homer.md
similarity index 100%
rename from wiki/docker-images/b4bz_-_homer.md
rename to wiki/docker/b4bz_-_homer.md
diff --git a/wiki/docker-images/benbusby_-_whoogle-search.md b/wiki/docker/benbusby_-_whoogle-search.md
similarity index 100%
rename from wiki/docker-images/benbusby_-_whoogle-search.md
rename to wiki/docker/benbusby_-_whoogle-search.md
diff --git a/wiki/docker-images/bilde2910_-_hauk.md b/wiki/docker/bilde2910_-_hauk.md
similarity index 100%
rename from wiki/docker-images/bilde2910_-_hauk.md
rename to wiki/docker/bilde2910_-_hauk.md
diff --git a/wiki/docker-images/chocobozzz_-_peertube.md b/wiki/docker/chocobozzz_-_peertube.md
similarity index 100%
rename from wiki/docker-images/chocobozzz_-_peertube.md
rename to wiki/docker/chocobozzz_-_peertube.md
diff --git a/wiki/docker-images/cloudrac3r_-_bibliogram.md b/wiki/docker/cloudrac3r_-_bibliogram.md
similarity index 100%
rename from wiki/docker-images/cloudrac3r_-_bibliogram.md
rename to wiki/docker/cloudrac3r_-_bibliogram.md
diff --git a/wiki/docker-images/dperson_-_torproxy.md b/wiki/docker/dperson_-_torproxy.md
similarity index 100%
rename from wiki/docker-images/dperson_-_torproxy.md
rename to wiki/docker/dperson_-_torproxy.md
diff --git a/wiki/docker-images/dyonr_-_jackettvpn.md b/wiki/docker/dyonr_-_jackettvpn.md
similarity index 100%
rename from wiki/docker-images/dyonr_-_jackettvpn.md
rename to wiki/docker/dyonr_-_jackettvpn.md
diff --git a/wiki/docker-images/dyonr_-_qbittorrentvpn.md b/wiki/docker/dyonr_-_qbittorrentvpn.md
similarity index 100%
rename from wiki/docker-images/dyonr_-_qbittorrentvpn.md
rename to wiki/docker/dyonr_-_qbittorrentvpn.md
diff --git a/wiki/docker-images/gitea_-_gitea.md b/wiki/docker/gitea_-_gitea.md
similarity index 100%
rename from wiki/docker-images/gitea_-_gitea.md
rename to wiki/docker/gitea_-_gitea.md
diff --git a/wiki/docker-images/haugene_-_transmission-openvpn.md b/wiki/docker/haugene_-_transmission-openvpn.md
similarity index 100%
rename from wiki/docker-images/haugene_-_transmission-openvpn.md
rename to wiki/docker/haugene_-_transmission-openvpn.md
diff --git a/wiki/docker-images/henrywhitaker3_-_speedtest-tracker.md b/wiki/docker/henrywhitaker3_-_speedtest-tracker.md
similarity index 100%
rename from wiki/docker-images/henrywhitaker3_-_speedtest-tracker.md
rename to wiki/docker/henrywhitaker3_-_speedtest-tracker.md
diff --git a/wiki/docker-images/itzg_-_minecraft-server.md b/wiki/docker/itzg_-_minecraft-server.md
similarity index 100%
rename from wiki/docker-images/itzg_-_minecraft-server.md
rename to wiki/docker/itzg_-_minecraft-server.md
diff --git a/wiki/docker-images/iv-org_-_invidious.md b/wiki/docker/iv-org_-_invidious.md
similarity index 100%
rename from wiki/docker-images/iv-org_-_invidious.md
rename to wiki/docker/iv-org_-_invidious.md
diff --git a/wiki/docker-images/jkarlos_-_git-server-docker.md b/wiki/docker/jkarlos_-_git-server-docker.md
similarity index 100%
rename from wiki/docker-images/jkarlos_-_git-server-docker.md
rename to wiki/docker/jkarlos_-_git-server-docker.md
diff --git a/wiki/docker-images/johnktims_-_folding-at-home.md b/wiki/docker/johnktims_-_folding-at-home.md
similarity index 100%
rename from wiki/docker-images/johnktims_-_folding-at-home.md
rename to wiki/docker/johnktims_-_folding-at-home.md
diff --git a/wiki/docker-images/jonohill_-_docker-openvpn-proxy.md b/wiki/docker/jonohill_-_docker-openvpn-proxy.md
similarity index 100%
rename from wiki/docker-images/jonohill_-_docker-openvpn-proxy.md
rename to wiki/docker/jonohill_-_docker-openvpn-proxy.md
diff --git a/wiki/docker-images/kylemanna_-_openvpn.md b/wiki/docker/kylemanna_-_openvpn.md
similarity index 100%
rename from wiki/docker-images/kylemanna_-_openvpn.md
rename to wiki/docker/kylemanna_-_openvpn.md
diff --git a/wiki/docker-images/linuxserver_-_airsonic-advanced.md b/wiki/docker/linuxserver_-_airsonic-advanced.md
similarity index 100%
rename from wiki/docker-images/linuxserver_-_airsonic-advanced.md
rename to wiki/docker/linuxserver_-_airsonic-advanced.md
diff --git a/wiki/docker-images/linuxserver_-_airsonic.md b/wiki/docker/linuxserver_-_airsonic.md
similarity index 100%
rename from wiki/docker-images/linuxserver_-_airsonic.md
rename to wiki/docker/linuxserver_-_airsonic.md
diff --git a/wiki/docker-images/linuxserver_-_freshrss.md b/wiki/docker/linuxserver_-_freshrss.md
similarity index 100%
rename from wiki/docker-images/linuxserver_-_freshrss.md
rename to wiki/docker/linuxserver_-_freshrss.md
diff --git a/wiki/docker-images/linuxserver_-_jellyfin.md b/wiki/docker/linuxserver_-_jellyfin.md
similarity index 100%
rename from wiki/docker-images/linuxserver_-_jellyfin.md
rename to wiki/docker/linuxserver_-_jellyfin.md
diff --git a/wiki/docker-images/linuxserver_-_lidarr.md b/wiki/docker/linuxserver_-_lidarr.md
similarity index 97%
rename from wiki/docker-images/linuxserver_-_lidarr.md
rename to wiki/docker/linuxserver_-_lidarr.md
index 0af1538..06f0bf3 100644
--- a/wiki/docker-images/linuxserver_-_lidarr.md
+++ b/wiki/docker/linuxserver_-_lidarr.md
@@ -13,7 +13,7 @@ It is recommended to set a download completed folder with the same internal and
 external mounts as your [BitTorent](/wiki/bittorrent.md) client.
 This guide uses the same mounts as used in the
 [Transmission](/wiki/transmission.md)
-[Docker container](/wiki/docker-images/haugene_-_transmission-openvpn.md).
+[Docker container](/wiki/docker/haugene_-_transmission-openvpn.md).
 This namely causes the following line in the
 [`docker-compose.yml`](#docker-composeyml).
 
diff --git a/wiki/docker-images/linuxserver_-_radarr.md b/wiki/docker/linuxserver_-_radarr.md
similarity index 97%
rename from wiki/docker-images/linuxserver_-_radarr.md
rename to wiki/docker/linuxserver_-_radarr.md
index 53bcccb..7eeefc9 100644
--- a/wiki/docker-images/linuxserver_-_radarr.md
+++ b/wiki/docker/linuxserver_-_radarr.md
@@ -13,7 +13,7 @@ It is recommended to set a download completed folder with the same internal and
 external mounts as your [BitTorent](/wiki/bittorrent.md) client.
 This guide uses the same mounts as used in the
 [Transmission](/wiki/transmission.md)
-[Docker container](/wiki/docker-images/haugene_-_transmission-openvpn.md).
+[Docker container](/wiki/docker/haugene_-_transmission-openvpn.md).
 This namely causes the following line in the
 [`docker-compose.yml`](#docker-composeyml).
 
diff --git a/wiki/docker-images/linuxserver_-_sonarr.md b/wiki/docker/linuxserver_-_sonarr.md
similarity index 97%
rename from wiki/docker-images/linuxserver_-_sonarr.md
rename to wiki/docker/linuxserver_-_sonarr.md
index ba870ff..b95a299 100644
--- a/wiki/docker-images/linuxserver_-_sonarr.md
+++ b/wiki/docker/linuxserver_-_sonarr.md
@@ -13,7 +13,7 @@ It is recommended to set a download completed folder with the same internal and
 external mounts as your [BitTorent](/wiki/bittorrent.md) client.
 This guide uses the same mounts as used in the
 [Transmission](/wiki/transmission.md)
-[Docker container](/wiki/docker-images/haugene_-_transmission-openvpn.md).
+[Docker container](/wiki/docker/haugene_-_transmission-openvpn.md).
 This namely causes the following line in the
 [`docker-compose.yml`](#docker-composeyml).
 
diff --git a/wiki/docker-images/linuxserver_-_syncthing.md b/wiki/docker/linuxserver_-_syncthing.md
similarity index 100%
rename from wiki/docker-images/linuxserver_-_syncthing.md
rename to wiki/docker/linuxserver_-_syncthing.md
diff --git a/wiki/docker-images/linuxserver_-_tvheadend.md b/wiki/docker/linuxserver_-_tvheadend.md
similarity index 100%
rename from wiki/docker-images/linuxserver_-_tvheadend.md
rename to wiki/docker/linuxserver_-_tvheadend.md
diff --git a/wiki/docker-images/linuxserver_-_wireguard.md b/wiki/docker/linuxserver_-_wireguard.md
similarity index 100%
rename from wiki/docker-images/linuxserver_-_wireguard.md
rename to wiki/docker/linuxserver_-_wireguard.md
diff --git a/wiki/docker-images/mailserver_-_docker-mailserver.md b/wiki/docker/mailserver_-_docker-mailserver.md
similarity index 95%
rename from wiki/docker-images/mailserver_-_docker-mailserver.md
rename to wiki/docker/mailserver_-_docker-mailserver.md
index f2d20d4..555e891 100644
--- a/wiki/docker-images/mailserver_-_docker-mailserver.md
+++ b/wiki/docker/mailserver_-_docker-mailserver.md
@@ -33,7 +33,7 @@ And finally generate the DCIM keys and rebuild once again.
 `./setup.sh config dkim`
 
 Finally if a reverse proxy is used check the
-[traefik entry](/wiki/docker-images/traefik.md#setup-mailserver) or the
+[traefik entry](/wiki/docker/traefik.md#setup-mailserver) or the
 [nginx entry](./nginx.md).
 
 Afterwards you're ready to go by once again running the `rebuild.sh` file.
diff --git a/wiki/docker-images/mariadb.md b/wiki/docker/mariadb.md
similarity index 100%
rename from wiki/docker-images/mariadb.md
rename to wiki/docker/mariadb.md
diff --git a/wiki/docker-images/matrixdotorg_-_synapse.md b/wiki/docker/matrixdotorg_-_synapse.md
similarity index 100%
rename from wiki/docker-images/matrixdotorg_-_synapse.md
rename to wiki/docker/matrixdotorg_-_synapse.md
diff --git a/wiki/docker-images/mikenye_-_picard.md b/wiki/docker/mikenye_-_picard.md
similarity index 100%
rename from wiki/docker-images/mikenye_-_picard.md
rename to wiki/docker/mikenye_-_picard.md
diff --git a/wiki/docker-images/mysql.md b/wiki/docker/mysql.md
similarity index 100%
rename from wiki/docker-images/mysql.md
rename to wiki/docker/mysql.md
diff --git a/wiki/docker-images/nextcloud.md b/wiki/docker/nextcloud.md
similarity index 100%
rename from wiki/docker-images/nextcloud.md
rename to wiki/docker/nextcloud.md
diff --git a/wiki/docker-images/nginx.md b/wiki/docker/nginx.md
similarity index 100%
rename from wiki/docker-images/nginx.md
rename to wiki/docker/nginx.md
diff --git a/wiki/docker-images/olbat_-_cupsd.md b/wiki/docker/olbat_-_cupsd.md
similarity index 100%
rename from wiki/docker-images/olbat_-_cupsd.md
rename to wiki/docker/olbat_-_cupsd.md
diff --git a/wiki/docker-images/owncloud.md b/wiki/docker/owncloud.md
similarity index 100%
rename from wiki/docker-images/owncloud.md
rename to wiki/docker/owncloud.md
diff --git a/wiki/docker-images/oznu_-_docker-cloudflare-ddns.md b/wiki/docker/oznu_-_docker-cloudflare-ddns.md
similarity index 100%
rename from wiki/docker-images/oznu_-_docker-cloudflare-ddns.md
rename to wiki/docker/oznu_-_docker-cloudflare-ddns.md
diff --git a/wiki/docker-images/oznu_-_onedrive.md b/wiki/docker/oznu_-_onedrive.md
similarity index 100%
rename from wiki/docker-images/oznu_-_onedrive.md
rename to wiki/docker/oznu_-_onedrive.md
diff --git a/wiki/docker-images/portainer_-_agent.md b/wiki/docker/portainer_-_agent.md
similarity index 100%
rename from wiki/docker-images/portainer_-_agent.md
rename to wiki/docker/portainer_-_agent.md
diff --git a/wiki/docker-images/portainer_-_portainer.md b/wiki/docker/portainer_-_portainer.md
similarity index 100%
rename from wiki/docker-images/portainer_-_portainer.md
rename to wiki/docker/portainer_-_portainer.md
diff --git a/wiki/docker-images/postgres.md b/wiki/docker/postgres.md
similarity index 100%
rename from wiki/docker-images/postgres.md
rename to wiki/docker/postgres.md
diff --git a/wiki/docker-images/prologic_-_golinks.md b/wiki/docker/prologic_-_golinks.md
similarity index 100%
rename from wiki/docker-images/prologic_-_golinks.md
rename to wiki/docker/prologic_-_golinks.md
diff --git a/wiki/docker-images/prologic_-_gopherproxy.md b/wiki/docker/prologic_-_gopherproxy.md
similarity index 100%
rename from wiki/docker-images/prologic_-_gopherproxy.md
rename to wiki/docker/prologic_-_gopherproxy.md
diff --git a/wiki/docker-images/prologic_-_todo.md b/wiki/docker/prologic_-_todo.md
similarity index 100%
rename from wiki/docker-images/prologic_-_todo.md
rename to wiki/docker/prologic_-_todo.md
diff --git a/wiki/docker-images/rblsb_-_synctube.md b/wiki/docker/rblsb_-_synctube.md
similarity index 100%
rename from wiki/docker-images/rblsb_-_synctube.md
rename to wiki/docker/rblsb_-_synctube.md
diff --git a/wiki/docker-images/redis.md b/wiki/docker/redis.md
similarity index 100%
rename from wiki/docker-images/redis.md
rename to wiki/docker/redis.md
diff --git a/wiki/docker-images/rlister_-_hastebin.md b/wiki/docker/rlister_-_hastebin.md
similarity index 100%
rename from wiki/docker-images/rlister_-_hastebin.md
rename to wiki/docker/rlister_-_hastebin.md
diff --git a/wiki/docker-images/samba.md b/wiki/docker/samba.md
similarity index 100%
rename from wiki/docker-images/samba.md
rename to wiki/docker/samba.md
diff --git a/wiki/docker-images/searx_-_searx.md b/wiki/docker/searx_-_searx.md
similarity index 100%
rename from wiki/docker-images/searx_-_searx.md
rename to wiki/docker/searx_-_searx.md
diff --git a/wiki/docker-images/sissbrueckner_-_linkding.md b/wiki/docker/sissbrueckner_-_linkding.md
similarity index 100%
rename from wiki/docker-images/sissbrueckner_-_linkding.md
rename to wiki/docker/sissbrueckner_-_linkding.md
diff --git a/wiki/docker-images/spikecodes_-_libreddit.md b/wiki/docker/spikecodes_-_libreddit.md
similarity index 100%
rename from wiki/docker-images/spikecodes_-_libreddit.md
rename to wiki/docker/spikecodes_-_libreddit.md
diff --git a/wiki/docker-images/teamspeak.md b/wiki/docker/teamspeak.md
similarity index 100%
rename from wiki/docker-images/teamspeak.md
rename to wiki/docker/teamspeak.md
diff --git a/wiki/docker-images/tetricz_-_mordhau-server.md b/wiki/docker/tetricz_-_mordhau-server.md
similarity index 100%
rename from wiki/docker-images/tetricz_-_mordhau-server.md
rename to wiki/docker/tetricz_-_mordhau-server.md
diff --git a/wiki/docker-images/tomsquest_-_docker-radicale.md b/wiki/docker/tomsquest_-_docker-radicale.md
similarity index 100%
rename from wiki/docker-images/tomsquest_-_docker-radicale.md
rename to wiki/docker/tomsquest_-_docker-radicale.md
diff --git a/wiki/docker-images/traefik.md b/wiki/docker/traefik.md
similarity index 100%
rename from wiki/docker-images/traefik.md
rename to wiki/docker/traefik.md
diff --git a/wiki/docker-images/vectorim_-_riot-web.md b/wiki/docker/vectorim_-_riot-web.md
similarity index 100%
rename from wiki/docker-images/vectorim_-_riot-web.md
rename to wiki/docker/vectorim_-_riot-web.md
diff --git a/wiki/docker-images/ventz_-_bind.md b/wiki/docker/ventz_-_bind.md
similarity index 100%
rename from wiki/docker-images/ventz_-_bind.md
rename to wiki/docker/ventz_-_bind.md
diff --git a/wiki/docker-images/wallabag_-_wallabag.md b/wiki/docker/wallabag_-_wallabag.md
similarity index 100%
rename from wiki/docker-images/wallabag_-_wallabag.md
rename to wiki/docker/wallabag_-_wallabag.md
diff --git a/wiki/docker-images/xy2z_-_pinedocs.md b/wiki/docker/xy2z_-_pinedocs.md
similarity index 100%
rename from wiki/docker-images/xy2z_-_pinedocs.md
rename to wiki/docker/xy2z_-_pinedocs.md
diff --git a/wiki/docker-images/yourls.md b/wiki/docker/yourls.md
similarity index 100%
rename from wiki/docker-images/yourls.md
rename to wiki/docker/yourls.md
diff --git a/wiki/docker-images/zedeus_-_nitter.md b/wiki/docker/zedeus_-_nitter.md
similarity index 100%
rename from wiki/docker-images/zedeus_-_nitter.md
rename to wiki/docker/zedeus_-_nitter.md
diff --git a/wiki/games/minecraft.md b/wiki/games/minecraft.md
index 1499951..e6a588a 100644
--- a/wiki/games/minecraft.md
+++ b/wiki/games/minecraft.md
@@ -9,7 +9,7 @@ The following sections address the setup of both server and client software.
 ### Server
 
 A server can be setup via docker with the
-[itzg image](../docker-images/itzg_-_minecraft-server.md).
+[itzg image](../docker/itzg_-_minecraft-server.md).
 
 ### Client
 
diff --git a/wiki/git.md b/wiki/git.md
index 6cdb646..058839c 100644
--- a/wiki/git.md
+++ b/wiki/git.md
@@ -33,5 +33,5 @@ Additionally it is easy to collaborate together.
 
 If you don't need a bloated web-interface a more basic approach is more than enough.
 
-- [git-server-docker](./docker-images/jkarlos_-_git-server-docker.md) is a pretty
+- [git-server-docker](./docker/jkarlos_-_git-server-docker.md) is a pretty
   basic docker-container for git.
diff --git a/wiki/gitea.md b/wiki/gitea.md
index b9d6c0c..5fba775 100644
--- a/wiki/gitea.md
+++ b/wiki/gitea.md
@@ -11,7 +11,7 @@ Gitea as a [Git](./git.md) service consists of a [client](#client) and a
 ### Server
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[gitea image](./docker-images/gitea_-_gitea.md).
+[gitea image](./docker/gitea_-_gitea.md).
 Additionally to this a client is needed on the system that need access to the
 server software.
 
diff --git a/wiki/golinks.md b/wiki/golinks.md
index 988fc4f..101579a 100644
--- a/wiki/golinks.md
+++ b/wiki/golinks.md
@@ -6,7 +6,7 @@ use bookmarks and run different searches by prefixes.
 ## Server
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[prologic image](./docker-images/prologic_-_golinks.md).
+[prologic image](./docker/prologic_-_golinks.md).
 
 ## Usage
 
diff --git a/wiki/hauk.md b/wiki/hauk.md
index df610fd..e9f8253 100644
--- a/wiki/hauk.md
+++ b/wiki/hauk.md
@@ -8,4 +8,4 @@ app that is available at
 ## Setup
 
 The server can be setup via [Docker](/wiki/docker.md) with the
-[bilde2910 image](/wiki/docker-images/bilde2910_-_hauk.md).
+[bilde2910 image](/wiki/docker/bilde2910_-_hauk.md).
diff --git a/wiki/invidious.md b/wiki/invidious.md
index 323d36d..936cfd8 100644
--- a/wiki/invidious.md
+++ b/wiki/invidious.md
@@ -7,7 +7,7 @@ It includes locally stored subscription management.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[iv-org image](./docker-images/iv-org_-_invidious.md).
+[iv-org image](./docker/iv-org_-_invidious.md).
 
 ## Usage
 
diff --git a/wiki/jackett.md b/wiki/jackett.md
index c58a8e3..45382cb 100644
--- a/wiki/jackett.md
+++ b/wiki/jackett.md
@@ -8,7 +8,7 @@ One of its main usecases is in feeding indexers to the
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[DyonR image](/wiki/docker-images/dyonr_-_jackettvpn.md) which also features a
+[DyonR image](/wiki/docker/dyonr_-_jackettvpn.md) which also features a
 VPN tunnel.
 
 ## Usage
diff --git a/wiki/jellyfin.md b/wiki/jellyfin.md
index 028a541..6f5fb8c 100644
--- a/wiki/jellyfin.md
+++ b/wiki/jellyfin.md
@@ -7,7 +7,7 @@ It includes a web-interface and is mainly used for
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[linuxserver image](./docker-images/linuxserver_-_jellyfin.md).
+[linuxserver image](./docker/linuxserver_-_jellyfin.md).
 
 ## Usage
 
diff --git a/wiki/libreddit.md b/wiki/libreddit.md
index 5722e71..72de500 100644
--- a/wiki/libreddit.md
+++ b/wiki/libreddit.md
@@ -6,7 +6,7 @@ Reddit.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[spikecodes image](./docker-images/spikecodes_-_libreddit.md).
+[spikecodes image](./docker/spikecodes_-_libreddit.md).
 
 ## Usage
 
diff --git a/wiki/linkding.md b/wiki/linkding.md
index 46bc561..3a6ff6e 100644
--- a/wiki/linkding.md
+++ b/wiki/linkding.md
@@ -6,7 +6,7 @@ bookmarking and archiving service.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[image by sissbrueckner](./docker-images/sissbrueckner_-_linkding.md).
+[image by sissbrueckner](./docker/sissbrueckner_-_linkding.md).
 
 ## Usage
 
diff --git a/wiki/mail.md b/wiki/mail.md
index 15587e6..febd742 100644
--- a/wiki/mail.md
+++ b/wiki/mail.md
@@ -11,7 +11,7 @@ E-mail usually consists of a [server](#server) and a [client](#client).
 If you want to host your own mail-server there are solutions with and without
 interfaces.
 
-- [Dovecot](./docker-images/tvial_-_docker-mailserver.md) is a simple dockerized
+- [Dovecot](./docker/tvial_-_docker-mailserver.md) is a simple dockerized
   mail server that has no interface.
 
 ## Client
diff --git a/wiki/matrix.md b/wiki/matrix.md
index f0e624c..d525723 100644
--- a/wiki/matrix.md
+++ b/wiki/matrix.md
@@ -13,7 +13,7 @@ This setup guide follows a modified version of the
 [guide by matusnovak](https://gist.github.com/matusnovak/37109e60abe79f4b59fc9fbda10896da).
 Furthermore this guide will assume you already have a
 [traefik v2.4](./traefik.md) instance setup as described in the
-[traefik docker image article](./docker-images/traefik.md).
+[traefik docker image article](./docker/traefik.md).
 
 ### DNS records
 
@@ -34,7 +34,7 @@ _matrix._tcp.matrix. <TTL> class SRV 1 10 443 synapse.example.com
 ### Synapse
 
 The docker-image used for the synapse matrix server can be found in the
-[docker-image directory](./docker-images/matrixdotorg_-_synapse.md).
+[docker-image directory](./docker/matrixdotorg_-_synapse.md).
 Create the `docker-compose.yml` file at a location of your choice (this guide
 will assume and recommend the file lies in a directory called matrix) with the
 following contents:
@@ -123,7 +123,7 @@ following the guide (this applies to any following step).
 ### Nginx
 
 The docker-image used for the nginx instance can be found in the
-[docker-image directory](./docker-images/nginx.md).
+[docker-image directory](./docker/nginx.md).
 For federation to work properly an nginx container is needed aswell.
 In the directory containing your `docker-compose.yml` create the file
 `data/matrix/nginx/matrix.conf` and fill in the following lines:
@@ -207,7 +207,7 @@ not correctly set up.
 ### Element web client
 
 The docker-image used for the web client can be found in the
-[docker-image directory](./docker-images/vectorim_-_riot-web.md).
+[docker-image directory](./docker/vectorim_-_riot-web.md).
 This section will add a self hosted Matrix web client in form of `Element`
 (which was previously called `riot`).
 
@@ -319,7 +319,7 @@ If any of that is not working there is something wrong with your configuration.
 ### Administration interface
 
 The docker-image used for the administration interface can be found in the
-[docker-image directory](./docker-images/awesometechnologies_-_synapse-admin.md).
+[docker-image directory](./docker/awesometechnologies_-_synapse-admin.md).
 This section will add a self hosted Matrix administration interface.
 This is especially useful if you have `enable_registration` set to `false`
 because you can dynamically create and administrate users and rooms.
diff --git a/wiki/metube.md b/wiki/metube.md
index 179b65b..b1df032 100644
--- a/wiki/metube.md
+++ b/wiki/metube.md
@@ -6,4 +6,4 @@ user interface for downloading [YouTube](/wiki/youtube.md) videos.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[alexta69 image](./docker-images/alexta69_-_metube.md).
+[alexta69 image](./docker/alexta69_-_metube.md).
diff --git a/wiki/nextcloud.md b/wiki/nextcloud.md
index 0f46a18..7863141 100644
--- a/wiki/nextcloud.md
+++ b/wiki/nextcloud.md
@@ -5,7 +5,7 @@ NextCloud is a free and open source client-server cloud-service.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[nextcloud image](./docker-images/nextcloud.md).
+[nextcloud image](./docker/nextcloud.md).
 
 When using NextCloud with a specific nginx configuration you have to append
 `'overwriteprotocol' => 'https',` to your `config/config.html`.
diff --git a/wiki/nginx.md b/wiki/nginx.md
index 5324f9a..9d6a59a 100644
--- a/wiki/nginx.md
+++ b/wiki/nginx.md
@@ -9,5 +9,5 @@ The software can be setup via [Docker](/wiki/docker.md) with a
 [terminal](/wiki/system_console.md) user interface program for nginx and
 certbot, which is called nginx-certbot-docker-tui or short ncdt.
 
-Alternatively the standalone [nginx image](./docker-images/nginx.md) can be
+Alternatively the standalone [nginx image](./docker/nginx.md) can be
 used.
diff --git a/wiki/nitter.md b/wiki/nitter.md
index 420b585..df24149 100644
--- a/wiki/nitter.md
+++ b/wiki/nitter.md
@@ -6,7 +6,7 @@ Twitter.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[zedeus image](./docker-images/zedeus_-_nitter.md).
+[zedeus image](./docker/zedeus_-_nitter.md).
 
 ## Usage
 
diff --git a/wiki/owncloud.md b/wiki/owncloud.md
index 9a7b6f3..29337c3 100644
--- a/wiki/owncloud.md
+++ b/wiki/owncloud.md
@@ -5,7 +5,7 @@ ownCloud is a free client-server cloud-service.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[owncloud image](./docker-images/owncloud.md).
+[owncloud image](./docker/owncloud.md).
 
 ## Usage
 
diff --git a/wiki/peertube.md b/wiki/peertube.md
index 57cc675..d38b895 100644
--- a/wiki/peertube.md
+++ b/wiki/peertube.md
@@ -6,4 +6,4 @@ platform using WebTorrent.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[chocobozzz image](./docker-images/chocobozzz_-_peertube.md).
+[chocobozzz image](./docker/chocobozzz_-_peertube.md).
diff --git a/wiki/picard.md b/wiki/picard.md
index d76a379..e4e3e38 100644
--- a/wiki/picard.md
+++ b/wiki/picard.md
@@ -15,7 +15,7 @@ it is available via a package often called `picard`.
 Picard can also be virtualized and accessed over [VNC](/wiki/vnc.md) or
 [web browser](/wiki/web_browser.md).
 This can be setup via [docker](/wiki/docker.md) with the
-[mikenye image](/wiki/docker-images/mikenye_-_picard.md).
+[mikenye image](/wiki/docker/mikenye_-_picard.md).
 
 ## Usage
 
diff --git a/wiki/podgrab.md b/wiki/podgrab.md
index 81bcace..7da74f2 100644
--- a/wiki/podgrab.md
+++ b/wiki/podgrab.md
@@ -6,4 +6,4 @@ podcatcher that can also be used to listen to podcasts.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[axhilrex](./docker-images/axhilrex_-_podgrab.md).
+[axhilrex](./docker/axhilrex_-_podgrab.md).
diff --git a/wiki/portainer.md b/wiki/portainer.md
index 8907bb6..18407d3 100644
--- a/wiki/portainer.md
+++ b/wiki/portainer.md
@@ -11,9 +11,9 @@ It consist of one [server](#server) and possibly multiple [agents](#agent).
 ### Server
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[portainer image](./docker-images/portainer_-_portainer.md).
+[portainer image](./docker/portainer_-_portainer.md).
 
 ## Agent
 
 An agent is a cluster of Docker API proxies.
-An agent can be setup via Docker with the [portainer image](./docker-images/portainer_-_agent.md).
+An agent can be setup via Docker with the [portainer image](./docker/portainer_-_agent.md).
diff --git a/wiki/qbittorrent.md b/wiki/qbittorrent.md
index b43d654..cf19592 100644
--- a/wiki/qbittorrent.md
+++ b/wiki/qbittorrent.md
@@ -6,7 +6,7 @@ open-source [BitTorrent client](/wiki/bittorrent.md#clients).
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[dyonr image](/wiki/docker-images/dyonr_-_qbittorrentvpn.md) that
+[dyonr image](/wiki/docker/dyonr_-_qbittorrentvpn.md) that
 includes an [OpenVPN](/wiki/vpn.md#openvpn) tunnel.
 
 ## Limiting  Upload and Download
diff --git a/wiki/samba.md b/wiki/samba.md
index a85c698..1e5ea4b 100644
--- a/wiki/samba.md
+++ b/wiki/samba.md
@@ -7,7 +7,7 @@ Samba is the standard Windows interoperability suite for Linux and Unix.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[samba image](./docker-images/samba.md).
+[samba image](./docker/samba.md).
 
 ## Usage
 
diff --git a/wiki/searx.md b/wiki/searx.md
index ba84b37..9a94e9d 100644
--- a/wiki/searx.md
+++ b/wiki/searx.md
@@ -5,7 +5,7 @@
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[searx image](./docker-images/searx_-_searx.md).
+[searx image](./docker/searx_-_searx.md).
 
 ## Usage
 
@@ -20,7 +20,7 @@ Follow the add-on part of the guide and put searx with
 
 ### Route search traffic through tor
 
-You can setup a torproxy with [the dperson image](./docker-images/dperson_-_torproxy.md).
+You can setup a torproxy with [the dperson image](./docker/dperson_-_torproxy.md).
 In the `settings.yml` file locate the section for `proxies :` and
 change it to the following:
 
diff --git a/wiki/syncthing.md b/wiki/syncthing.md
index d9da397..f5208ae 100644
--- a/wiki/syncthing.md
+++ b/wiki/syncthing.md
@@ -7,7 +7,7 @@ The Software synchronizes files between multiple devices directly.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[linuxserver image](./docker-images/linuxserver_-_syncthing.md).
+[linuxserver image](./docker/linuxserver_-_syncthing.md).
 
 Additionally the software can be installed by visiting the
 [official website](https://syncthing.net/downloads/) and download it from
diff --git a/wiki/synctube.md b/wiki/synctube.md
index ce2c0ab..8c8c80c 100644
--- a/wiki/synctube.md
+++ b/wiki/synctube.md
@@ -6,4 +6,4 @@ videos in sync with other people.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[rblsb image](./docker-images/rblsb_-_synctube.md).
+[rblsb image](./docker/rblsb_-_synctube.md).
diff --git a/wiki/teamspeak3.md b/wiki/teamspeak3.md
index c6b6466..e004540 100644
--- a/wiki/teamspeak3.md
+++ b/wiki/teamspeak3.md
@@ -5,7 +5,7 @@
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[teamspeak image](./docker-images/teamspeak.md).
+[teamspeak image](./docker/teamspeak.md).
 
 ## Usage
 
diff --git a/wiki/tor.md b/wiki/tor.md
index 50ace25..6eb4640 100644
--- a/wiki/tor.md
+++ b/wiki/tor.md
@@ -13,4 +13,4 @@ This section features various features of Tor.
 A Tor proxy can be used to access the Tor network via the SOCKS protocol, an
 HTTP tunnel protocol or other ways.
 It can be set up using [docker](/wiki/docker.md) and the
-[dperson image](./docker-images/dperson_-_torproxy.md).
+[dperson image](./docker/dperson_-_torproxy.md).
diff --git a/wiki/traefik.md b/wiki/traefik.md
index 6e60024..ca19c23 100644
--- a/wiki/traefik.md
+++ b/wiki/traefik.md
@@ -6,4 +6,4 @@ a special integration of infrastructure components (e.g. [Docker](./docker.md)).
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[traefik image](./docker-images/traefik.md).
+[traefik image](./docker/traefik.md).
diff --git a/wiki/transmission.md b/wiki/transmission.md
index 90af9bc..eadb56a 100644
--- a/wiki/transmission.md
+++ b/wiki/transmission.md
@@ -6,7 +6,7 @@
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[haugene image](./docker-images/haugene_-_transmission-openvpn.md) that
+[haugene image](./docker/haugene_-_transmission-openvpn.md) that
 includes an openvpn tunnel.
 
 ## Limiting  Upload
@@ -23,7 +23,7 @@ To increase this number edit the file `~/.config/transmission/settings.json`
 inside the system that runs Transmission and change change the following line to
 the preferred number of downloads.
 When running
-[the haugene image](./docker-images/haugene_-_transmission-openvpn.md) the file
+[the haugene image](./docker/haugene_-_transmission-openvpn.md) the file
 is located at `/config/transmission-home/settings.json`.
 
 ```txt
diff --git a/wiki/tvheadend.md b/wiki/tvheadend.md
index d22d931..2fedeb5 100644
--- a/wiki/tvheadend.md
+++ b/wiki/tvheadend.md
@@ -13,7 +13,7 @@ the help of a plugin.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[linuxserver image](./docker-images/linuxserver_-_tvheadend.md).
+[linuxserver image](./docker/linuxserver_-_tvheadend.md).
 For different hardware there may be additional run options needed to get
 TVHeadend working properly.
 Additionally a solid [initial configuration](#initial-configuration) is
diff --git a/wiki/vpn.md b/wiki/vpn.md
index eda14dc..e7da1c5 100644
--- a/wiki/vpn.md
+++ b/wiki/vpn.md
@@ -18,7 +18,7 @@ In the following sections the different set ups of OpenVPN usages are described.
 #### OVPN Server
 
 The software can be set up via [Docker](/wiki/docker.md) with the
-[kylemanna image](./docker-images/kylemanna_-_openvpn.md).
+[kylemanna image](./docker/kylemanna_-_openvpn.md).
 Additionally to this a client is needed on the system that need access to the
 server software.
 
@@ -34,7 +34,7 @@ For most linux distributions there is a package called `openvpn`.
 For OpenVPN a proxy acts as an imntermediary between the system communicating
 with the proxy and the OpenVPN server.
 A proxy can be set up via [Docker](/wiki/docker.md) with the
-[jonohill image](./docker-images/jonohill_-_docker-openvpn-proxy.md).
+[jonohill image](./docker/jonohill_-_docker-openvpn-proxy.md).
 
 ## WireGuard
 
@@ -52,7 +52,7 @@ In the following sections the different set ups of WireGuard usages are describe
 #### WG Server
 
 The software can be set up via [Docker](/wiki/docker.md) with the
-[linuxserver image](/wiki/docker-images/linuxserver_-_wireguard.md).
+[linuxserver image](/wiki/docker/linuxserver_-_wireguard.md).
 Additionally to this a [client](#client-wg) is needed on the system that
 accesses the server.
 
diff --git a/wiki/wallabag.md b/wiki/wallabag.md
index 05641b9..b3ee40b 100644
--- a/wiki/wallabag.md
+++ b/wiki/wallabag.md
@@ -5,7 +5,7 @@
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[wallabag image](./docker-images/wallabag_-_wallabag.md).
+[wallabag image](./docker/wallabag_-_wallabag.md).
 
 ## Usage
 
diff --git a/wiki/whoogle.md b/wiki/whoogle.md
index 49adafe..48783f1 100644
--- a/wiki/whoogle.md
+++ b/wiki/whoogle.md
@@ -6,7 +6,7 @@ metasearch engine.
 ## Setup
 
 The software can be setup via [Docker](/wiki/docker.md) with the
-[image by benbusby](./docker-images/benbusby_-_whoogle-search.md)
+[image by benbusby](./docker/benbusby_-_whoogle-search.md)
 
 ## Usage