diff --git a/config/docker-files/7.2-Dockerfile b/config/docker-files/7.2-Dockerfile
index 18405ca3ac16379eae8b51661d9d7246149ccc4b..ad0a5343e9da39e0f5da1630fee2c939eec0507f 100644
--- a/config/docker-files/7.2-Dockerfile
+++ b/config/docker-files/7.2-Dockerfile
@@ -24,21 +24,18 @@ RUN apt update && apt install -y --no-install-recommends \
     && sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
     && dpkg-reconfigure --frontend=noninteractive locales \
     && update-locale \
-
 # Install php extensions
     && docker-php-ext-configure gd --with-jpeg-dir --with-freetype-dir --with-webp-dir \
     && docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip \
     && pecl install memcached redis \
     && docker-php-ext-enable memcached redis \
-
 # Cleanup
 RUN docker-php-source delete \
     && apt-get autoremove --purge -y \
     && apt-get autoclean -y \
     && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
     && pecl clear-cache \
-
 # Enable PS in gs
     && sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \
         /etc/ImageMagick-6/policy.xml
diff --git a/config/docker-files/7.3-Dockerfile b/config/docker-files/7.3-Dockerfile
index 91cd7483a82c7813dec0073ed9fc51a1f9ae1703..543aeeb036ccb4d9a0d0c77f5aff881b0814b30d 100644
--- a/config/docker-files/7.3-Dockerfile
+++ b/config/docker-files/7.3-Dockerfile
@@ -19,19 +19,16 @@ RUN apt update && apt install -y --no-install-recommends \
         libxml2-dev \
         libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
         locales \
-
 # Install locales
 RUN sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
     && sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
     && dpkg-reconfigure --frontend=noninteractive locales \
     && update-locale \
-
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg-dir --with-freetype-dir --with-webp-dir \
     && docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip \
     && pecl install memcached redis \
     && docker-php-ext-enable memcached redis \
-
 # Cleanup
 RUN docker-php-source delete \
     && apt-get autoremove --purge -y \
@@ -39,7 +36,6 @@ RUN docker-php-source delete \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/* \
     && pecl clear-cache \
-
 # Enable PS in gs
 RUN sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \
         /etc/ImageMagick-6/policy.xml
diff --git a/config/docker-files/7.4-Dockerfile b/config/docker-files/7.4-Dockerfile
index 13a1619daae970e9c8a0342199141c68bd714e2d..58aa991e7f82b9c88fdc404562d6e84842fe5702 100644
--- a/config/docker-files/7.4-Dockerfile
+++ b/config/docker-files/7.4-Dockerfile
@@ -19,19 +19,16 @@ RUN apt update && apt install -y --no-install-recommends \
         libxml2-dev \
         libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
         locales \
-
 # Install locales
     && sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
     && sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
     && dpkg-reconfigure --frontend=noninteractive locales \
     && update-locale \
-
 # Install php extensions
     && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \
     && docker-php-ext-install -j$(nproc) gd gettext intl opcache pdo_mysql pdo_pgsql soap xsl zip \
     && pecl install memcached redis \
     && docker-php-ext-enable memcached redis \
-
 # Cleanup
     && docker-php-source delete \
     && apt-get autoremove --purge -y \
@@ -39,7 +36,6 @@ RUN apt update && apt install -y --no-install-recommends \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/* \
     && pecl clear-cache \
-
 # Enable PS in gs
 RUN sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \
         /etc/ImageMagick-6/policy.xml
diff --git a/config/docker-files/8.0-Dockerfile b/config/docker-files/8.0-Dockerfile
index 689d852add2d9c1b49ec3b7d4c0383fa7bdcea25..0ee1396859e238ded244a6559993deed1a3db7a2 100644
--- a/config/docker-files/8.0-Dockerfile
+++ b/config/docker-files/8.0-Dockerfile
@@ -19,27 +19,23 @@ RUN apt update && apt install -y --no-install-recommends \
         libxml2-dev \
         libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
         locales \
-
 # Install locales
     && sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
     && sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
     && dpkg-reconfigure --frontend=noninteractive locales \
     && update-locale \
-
 # Install php extensions
     && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \
     && docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip
     && pecl install memcached redis \
     && docker-php-ext-enable memcached redis \
-
 # Cleanup
-    && docker-php-source delete
+    && docker-php-source delete \
     && apt-get autoremove --purge -y \
     && apt-get autoclean -y \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/* \
     && pecl clear-cache \
-
 # Enable PS in gs
     && sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \
         /etc/ImageMagick-6/policy.xml
diff --git a/config/docker-files/8.1-Dockerfile b/config/docker-files/8.1-Dockerfile
index f131e3682105bf2fd4281ed5c5baa54ec405e345..677597d6b2167248a898c715316801d8efcc45db 100644
--- a/config/docker-files/8.1-Dockerfile
+++ b/config/docker-files/8.1-Dockerfile
@@ -20,19 +20,16 @@ RUN apt update && apt install -y --no-install-recommends \
         libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
         locales \
         vim \
-
 # Install locales
     && sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
     && sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
     && dpkg-reconfigure --frontend=noninteractive locales \
     && update-locale \
-
 # Install php extensions
     && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \
     && docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip \
     && pecl install memcached redis \
     && docker-php-ext-enable memcached redis \
-
 # Cleanup
     && docker-php-source delete \
     && apt-get autoremove --purge -y \
@@ -40,7 +37,6 @@ RUN apt update && apt install -y --no-install-recommends \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/* \
     && pecl clear-cache \
-
 # Enable PS in gs
     && sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \
         /etc/ImageMagick-6/policy.xml
diff --git a/config/docker-files/8.2-Dockerfile b/config/docker-files/8.2-Dockerfile
index 423e8043548260e25abddf8c57f760efd1a90abc..efeea3c4748445eed67e8f616371921f86821076 100644
--- a/config/docker-files/8.2-Dockerfile
+++ b/config/docker-files/8.2-Dockerfile
@@ -19,19 +19,16 @@ RUN apt update && apt install -y --no-install-recommends \
         libxml2-dev \
         libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
         locales \
-
 # Install locales
     && sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
     && sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
     && dpkg-reconfigure --frontend=noninteractive locales \
     && update-locale \
-
 # Install php extensions
     && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \
     && docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip \
     && pecl install memcached redis \
     && docker-php-ext-enable memcached redis \
-
 # Cleanup
     && docker-php-source delete \
     && apt-get autoremove --purge -y \
@@ -39,7 +36,6 @@ RUN apt update && apt install -y --no-install-recommends \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/* \
     && pecl clear-cache \
-
 # Enable PS in gs
     && sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \
         /etc/ImageMagick-6/policy.xml
diff --git a/config/docker-files/8.3-Dockerfile b/config/docker-files/8.3-Dockerfile
index 60e0c0ce519c9f3726229dda555520a02bd63287..639668a9c8ca84ad3f7f0d6915df506727fd8409 100644
--- a/config/docker-files/8.3-Dockerfile
+++ b/config/docker-files/8.3-Dockerfile
@@ -21,19 +21,16 @@ RUN apt update \
         libxml2-dev \
         locales \
         libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
-
 # Install locales
     && sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
     && sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
     && dpkg-reconfigure --frontend=noninteractive locales \
     && update-locale \
-
 # Install php extensions
     && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \
     && docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip \
     && pecl install memcached redis \
     && docker-php-ext-enable memcached redis \
-
 # Cleanup
     && docker-php-source delete \
     && apt-get autoremove --purge -y \
@@ -41,7 +38,6 @@ RUN apt update \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/* \
     && pecl clear-cache \
-
 # Enable PS in gs \
     && sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \
         /etc/ImageMagick-6/policy.xml
diff --git a/config/docker-files/8.4-Dockerfile b/config/docker-files/8.4-Dockerfile
index 43d30d27193f389ded63dd643a5b2dde15ce3abd..518d45c51c9aa711da8be26aee3b428f60b064fb 100644
--- a/config/docker-files/8.4-Dockerfile
+++ b/config/docker-files/8.4-Dockerfile
@@ -22,13 +22,11 @@ RUN apt update \
         libxml2-dev \
         locales \
         libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
-
 # Install locales
     && sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen \
     && sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen \
     && dpkg-reconfigure --frontend=noninteractive locales \
     && update-locale \
-
 # Install php extensions
     && docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp \
     && docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap xsl zip \
@@ -36,7 +34,6 @@ RUN apt update \
 #    && docker-php-ext-enable memcached redis xdebug \
     && pecl install memcached redis \
     && docker-php-ext-enable memcached redis \
-
 # Cleanup
     && docker-php-source delete \
     && apt-get autoremove --purge -y \
@@ -44,7 +41,6 @@ RUN apt update \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/* \
     && pecl clear-cache \
-
 # Enable PS in gs
     && sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \
         /etc/ImageMagick-6/policy.xml
diff --git a/lib/Commands/Sites/Add.php b/lib/Commands/Sites/Add.php
index 0bbd870986926c90afef1b6b4f6dd3a779209f1b..f601a6c2ea1b5c576ee8db25877072ae46de989d 100644
--- a/lib/Commands/Sites/Add.php
+++ b/lib/Commands/Sites/Add.php
@@ -57,6 +57,10 @@ final class Add extends Command
                 throw new Exception('Web path cannot be empty');
             }
 
+            if ($webPath === 'sites') {
+                throw new Exception("Web path 'sites' is prohibited");
+            }
+
             if (array_key_exists($webPath, Config::getInstance()->get('sites') ?? [])) {
                 throw new Exception('Site "' . $webPath . '" already exists.');
             }
diff --git a/lib/Commands/Sites/Remove.php b/lib/Commands/Sites/Remove.php
index c435b62fef59a52793cfca3cd671773947d67480..ab2f409bd0caf86beb535fd18e99bbaf28e55a16 100644
--- a/lib/Commands/Sites/Remove.php
+++ b/lib/Commands/Sites/Remove.php
@@ -2,6 +2,7 @@
 
 namespace Studip\Dockerized\Commands\Sites;
 
+use Exception;
 use Studip\Dockerized\Config;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -27,6 +28,10 @@ final class Remove extends Command
         $config = Config::getInstance();
         $sites = $config->get('sites') ?? [];
 
+        if ($webPath === 'sites') {
+            throw new Exception("Web path 'sites' is prohibited");
+        }
+
         if (!array_key_exists($webPath, $sites)) {
             $io->error("The site '{$webPath}' does not exist.");
             return Command::FAILURE;
@@ -42,7 +47,7 @@ final class Remove extends Command
 
         $config->store();
 
-        $io->success('Site ' . $webPath . ' has been removed.');
+        $io->success("Site '{$webPath}' has been removed.");
 
         return Command::SUCCESS;
     }