diff --git a/8.5-debian-prod/Dockerfile b/8.5-debian-prod/Dockerfile
index 49db903..e2370ac 100644
--- a/8.5-debian-prod/Dockerfile
+++ b/8.5-debian-prod/Dockerfile
@@ -52,7 +52,6 @@ RUN useradd -m -u 1337 kool \
         intl \
         ldap \
         mbstring \
-        opcache \
         pcntl \
         pdo \
         pdo_mysql \
diff --git a/8.5-prod/Dockerfile b/8.5-prod/Dockerfile
index 8cb70b9..5efe2f2 100644
--- a/8.5-prod/Dockerfile
+++ b/8.5-prod/Dockerfile
@@ -47,7 +47,6 @@ RUN adduser -D -u 1337 kool \
         intl \
         ldap \
         mbstring \
-        opcache \
         pcntl \
         pdo \
         pdo_mysql \
diff --git a/template/Dockerfile-debian.blade.php b/template/Dockerfile-debian.blade.php
index 9f3bae7..8f1203b 100644
--- a/template/Dockerfile-debian.blade.php
+++ b/template/Dockerfile-debian.blade.php
@@ -55,7 +55,7 @@
         intl \
         ldap \
         mbstring \
-@if ($prod)
+@if ($prod && version_compare($version, '8.5', '<'))
         opcache \
 @endif
         pcntl \
diff --git a/template/Dockerfile.blade.php b/template/Dockerfile.blade.php
index 898e69a..9875109 100644
--- a/template/Dockerfile.blade.php
+++ b/template/Dockerfile.blade.php
@@ -57,7 +57,7 @@
         intl \
         ldap \
         mbstring \
-@if ($prod)
+@if ($prod && version_compare($version, '8.5', '<'))
         opcache \
 @endif
         pcntl \