diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base.app
similarity index 76%
rename from docker/Dockerfile.base
rename to docker/Dockerfile.base.app
index 4d696e2..9d53451 100644
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base.app
@@ -11,6 +11,4 @@ RUN install-php-extensions \
 	gd \
 	intl \
 	zip \
-	opcache && \
-    apt install -y wget && \
-    apt clean && apt autoremove
+	opcache
diff --git a/docker/Dockerfile.base.worker b/docker/Dockerfile.base.worker
new file mode 100644
index 0000000..668e6ce
--- /dev/null
+++ b/docker/Dockerfile.base.worker
@@ -0,0 +1,19 @@
+ARG FRANKENPHP_TAG
+
+FROM dunglas/frankenphp:${FRANKENPHP_TAG}
+
+ENV SERVER_NAME=":80"
+ENV CADDY_GLOBAL_OPTIONS="auto_https off"
+ENV APP_RUNTIME="Runtime\\FrankenPhpSymfony\\Runtime"
+
+ARG APP_VERSION="0.dev"
+ENV APP_VERSION="${APP_VERSION}"
+
+RUN install-php-extensions \
+	pdo_mysql \
+	gd \
+	intl \
+	zip \
+	opcache
+
+RUN apk add --no-cache wget
diff --git a/docker/Dockerfile.scheduler b/docker/Dockerfile.scheduler
index 98f66b6..b2b1d2f 100644
--- a/docker/Dockerfile.scheduler
+++ b/docker/Dockerfile.scheduler
@@ -1,6 +1,6 @@
-ARG APP_VERSION
+FROM code.caldwell.digital/home/torsearch-base-worker:php8.4-alpine
 
-FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION}
+COPY . /app
 
 ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "scheduler_monitor" ]
 
diff --git a/docker/Dockerfile.worker b/docker/Dockerfile.worker
index 6bc6a13..89bb627 100644
--- a/docker/Dockerfile.worker
+++ b/docker/Dockerfile.worker
@@ -1,10 +1,6 @@
-ARG APP_VERSION
+FROM code.caldwell.digital/home/torsearch-base-worker:php8.4-alpine
 
-FROM code.caldwell.digital/home/torsearch-app:${APP_VERSION}
-
-RUN apt install -y wget && \
-    apt autoremove && \
-    apt clean
+COPY . /app
 
 ENTRYPOINT [ "php", "/app/bin/console", "messenger:consume", "async" ]