diff --git a/config/docker-files/7.2-Dockerfile b/config/docker-files/7.2-Dockerfile
index 96071ab9df751b33373af2b8c1f6cb0ac08c13e8..8c86e1278fbce95d056570b0afa9aac28379bbb9 100644
--- a/config/docker-files/7.2-Dockerfile
+++ b/config/docker-files/7.2-Dockerfile
@@ -26,12 +26,16 @@ RUN locale-gen de_DE.UTF-8 \
 
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg-dir --with-freetype-dir --with-webp-dir
-RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo_mysql pdo_pgsql soap zip
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap zip
 
 # Install Memcached & redis
 RUN 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
+
 # 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.3-Dockerfile b/config/docker-files/7.3-Dockerfile
index 3c1ff34e1780f68e51133a5b57aacd467319d1d2..2355daa49c33e2d26f8b0a7f10c3985104a2c7db 100644
--- a/config/docker-files/7.3-Dockerfile
+++ b/config/docker-files/7.3-Dockerfile
@@ -26,12 +26,16 @@ RUN locale-gen de_DE.UTF-8 \
 
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg-dir --with-freetype-dir --with-webp-dir
-RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo_mysql pdo_pgsql soap zip
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap zip
 
 # Install Memcached
 RUN 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
+
 # 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 fb3afe0a18b7dc4fe9d655b840feb0f35b0f27e7..2e01471193a70bcecc0f69e4c861bb032771cbc3 100644
--- a/config/docker-files/7.4-Dockerfile
+++ b/config/docker-files/7.4-Dockerfile
@@ -26,12 +26,16 @@ RUN locale-gen de_DE.UTF-8 \
 
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp
-RUN docker-php-ext-install -j$(nproc) gd gettext intl pdo_mysql pdo_pgsql soap zip
+RUN docker-php-ext-install -j$(nproc) gd gettext intl opcache pdo_mysql pdo_pgsql soap zip
 
 # Install Memcached & redis
 RUN 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
+
 # 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 9fd1fc6d2cb100b342bd3497528c5697a1fe9393..3d56102537771a808df51bc963724c864b08f282 100644
--- a/config/docker-files/8.0-Dockerfile
+++ b/config/docker-files/8.0-Dockerfile
@@ -26,12 +26,16 @@ RUN locale-gen de_DE.UTF-8 \
 
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp
-RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo_mysql pdo_pgsql soap zip
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap zip
 
 # Install Memcached & redis
 RUN 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
+
 # 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.1-Dockerfile b/config/docker-files/8.1-Dockerfile
index b6eb7da4bc641ac1c3dfc8513548fb597edb2cf2..52544cbf1bb00b1576d163918ded8f75a582b887 100644
--- a/config/docker-files/8.1-Dockerfile
+++ b/config/docker-files/8.1-Dockerfile
@@ -26,12 +26,16 @@ RUN locale-gen de_DE.UTF-8 \
 
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp
-RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo_mysql pdo_pgsql soap zip
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap zip
 
 # Install Memcached & redis
 RUN 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
+
 # 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.2-Dockerfile b/config/docker-files/8.2-Dockerfile
index 69b9d252829f552c31724c8380873f23be21bfb3..27a735b0fa33f27071c9dd482fdc0e5e2cbb7033 100644
--- a/config/docker-files/8.2-Dockerfile
+++ b/config/docker-files/8.2-Dockerfile
@@ -26,12 +26,16 @@ RUN locale-gen de_DE.UTF-8 \
 
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp
-RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo_mysql pdo_pgsql soap zip
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap zip
 
 # Install Memcached & redis
 RUN 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
+
 # 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.3-Dockerfile b/config/docker-files/8.3-Dockerfile
index 7f8df20c05f599953ff26bcb685e654c0effe382..16821dd10791dc738318a12919d139e3475d742b 100644
--- a/config/docker-files/8.3-Dockerfile
+++ b/config/docker-files/8.3-Dockerfile
@@ -27,12 +27,16 @@ RUN locale-gen de_DE.UTF-8 \
 
 # Install php extensions
 RUN docker-php-ext-configure gd --with-jpeg --with-freetype --with-webp
-RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli pdo_mysql pdo_pgsql soap zip
+RUN docker-php-ext-install -j$(nproc) gd gettext intl mysqli opcache pdo_mysql pdo_pgsql soap zip
 
 # Install Memcached and redis
 RUN 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
+
 # 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/php.ini b/config/php.ini
index 87fc366700dca44ee7e30e63833b501c30560160..610f462e10a19d9d522f689887b95359ee33bd5d 100644
--- a/config/php.ini
+++ b/config/php.ini
@@ -3,3 +3,9 @@ max_execution_time=300
 upload_max_filesize=8M
 post_max_size=9M
 error_reporting=22519
+
+zend_extension=opcache.so
+opcache.enable=1
+opcache.enable_cli=1
+opcache.jit=tracing
+opcache.jit_buffer_size=100M
diff --git a/lib/Commands/Docker/Build.php b/lib/Commands/Docker/Build.php
index 3ba1047f6728ed06eb0c7d93e49928adc5d15530..bfbc10b468b72b77b791b38fe6a2a9f38acfc468 100644
--- a/lib/Commands/Docker/Build.php
+++ b/lib/Commands/Docker/Build.php
@@ -14,6 +14,7 @@ final class Build extends DockerComposeCommand
         $this->setName('docker:build');
         $this->setDescription('Build containers');
     }
+
     protected function getDockerComposeCommand(): array
     {
         $dockerRunning = $this->isDockerRunning();
@@ -46,4 +47,4 @@ final class Build extends DockerComposeCommand
 
         return Command::SUCCESS;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/SupportedPHPVersions.php b/lib/SupportedPHPVersions.php
index 1b70aee03d0d493ce1f4c1443672ac5975bc657f..6309a86fbb2ad86faaec7ae144fc912beab8646b 100644
--- a/lib/SupportedPHPVersions.php
+++ b/lib/SupportedPHPVersions.php
@@ -4,13 +4,13 @@ namespace Studip\Dockerized;
 final class SupportedPHPVersions
 {
     private const CONFIGURATION = [
-        '7.2' => [8072, 18072],
-        '7.3' => [8073, 18073],
-        '7.4' => [8074, 18074],
-        '8.0' => [8080, 18080],
-        '8.1' => [8081, 18081],
-        '8.2' => [8082, 18082],
-        '8.3' => [8083, 18083],
+        '7.2' => [8072, 8872],
+        '7.3' => [8073, 8873],
+        '7.4' => [8074, 8874],
+        '8.0' => [8080, 8880],
+        '8.1' => [8081, 8881],
+        '8.2' => [8082, 8882],
+        '8.3' => [8083, 8883],
     ];
 
     private const DEFAULT = ['7.4', '8.1', '8.3'];