diff --git a/8.4/Dockerfile b/8.4/Dockerfile
index e6b738c..4e4ea3a 100644
--- a/8.4/Dockerfile
+++ b/8.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM serversideup/php:8.4-fpm-nginx-alpine
+FROM serversideup/php:8.4-fpm-nginx-alpine-v5.0.0
 
 COPY --chmod=755 common/etc/entrypoint.d /etc/entrypoint.d
 COPY --chmod=755 common/etc/s6-overlay /etc/s6-overlay
@@ -12,9 +12,7 @@ ENV PHP_UPLOAD_MAX_FILE_SIZE=${PHP_POST_MAX_SIZE}
 
 # OPcache settings
 ENV PHP_OPCACHE_ENABLE=1
-ENV PHP_OPCACHE_INTERNED_STRINGS_BUFFER=8
-ENV PHP_OPCACHE_MEMORY_CONSUMPTION=128
-ENV PHP_OPCACHE_REVALIDATE_FREQ=2
+ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS=0
 
 # PHP-FPM settings
 ENV PHP_FPM_PM_CONTROL=ondemand
diff --git a/common/etc/s6-overlay/s6-rc.d/queue/data/check b/common/etc/s6-overlay/user-bundles.d/queue/data/check
similarity index 100%
rename from common/etc/s6-overlay/s6-rc.d/queue/data/check
rename to common/etc/s6-overlay/user-bundles.d/queue/data/check
diff --git a/common/etc/s6-overlay/s6-rc.d/queue/down-signal b/common/etc/s6-overlay/user-bundles.d/queue/down-signal
similarity index 100%
rename from common/etc/s6-overlay/s6-rc.d/queue/down-signal
rename to common/etc/s6-overlay/user-bundles.d/queue/down-signal
diff --git a/common/etc/s6-overlay/s6-rc.d/queue/run b/common/etc/s6-overlay/user-bundles.d/queue/run
similarity index 100%
rename from common/etc/s6-overlay/s6-rc.d/queue/run
rename to common/etc/s6-overlay/user-bundles.d/queue/run
diff --git a/common/etc/s6-overlay/s6-rc.d/queue/type b/common/etc/s6-overlay/user-bundles.d/queue/type
similarity index 100%
rename from common/etc/s6-overlay/s6-rc.d/queue/type
rename to common/etc/s6-overlay/user-bundles.d/queue/type
diff --git a/common/etc/s6-overlay/s6-rc.d/schedule/data/check b/common/etc/s6-overlay/user-bundles.d/schedule/data/check
similarity index 100%
rename from common/etc/s6-overlay/s6-rc.d/schedule/data/check
rename to common/etc/s6-overlay/user-bundles.d/schedule/data/check
diff --git a/common/etc/s6-overlay/s6-rc.d/schedule/down-signal b/common/etc/s6-overlay/user-bundles.d/schedule/down-signal
similarity index 100%
rename from common/etc/s6-overlay/s6-rc.d/schedule/down-signal
rename to common/etc/s6-overlay/user-bundles.d/schedule/down-signal
diff --git a/common/etc/s6-overlay/s6-rc.d/schedule/run b/common/etc/s6-overlay/user-bundles.d/schedule/run
similarity index 100%
rename from common/etc/s6-overlay/s6-rc.d/schedule/run
rename to common/etc/s6-overlay/user-bundles.d/schedule/run
diff --git a/common/etc/s6-overlay/s6-rc.d/schedule/type b/common/etc/s6-overlay/user-bundles.d/schedule/type
similarity index 100%
rename from common/etc/s6-overlay/s6-rc.d/schedule/type
rename to common/etc/s6-overlay/user-bundles.d/schedule/type
diff --git a/common/etc/s6-overlay/s6-rc.d/user/contents.d/queue b/common/etc/s6-overlay/user-bundles.d/user/contents.d/queue
similarity index 100%
rename from common/etc/s6-overlay/s6-rc.d/user/contents.d/queue
rename to common/etc/s6-overlay/user-bundles.d/user/contents.d/queue
diff --git a/common/etc/s6-overlay/s6-rc.d/user/contents.d/schedule b/common/etc/s6-overlay/user-bundles.d/user/contents.d/schedule
similarity index 100%
rename from common/etc/s6-overlay/s6-rc.d/user/contents.d/schedule
rename to common/etc/s6-overlay/user-bundles.d/user/contents.d/schedule