diff --git a/.gitea/workflows/build_base_images.yml b/.gitea/workflows/build_base_images.yml
index c675abd..7d85e45 100644
--- a/.gitea/workflows/build_base_images.yml
+++ b/.gitea/workflows/build_base_images.yml
@@ -17,32 +17,20 @@ jobs:
           username: "${{ vars.REGISTRY_USER }}"
           password: "${{ vars.REGISTRY_PASS }}"
 
-      - name: Create torsearch-app docker image
-        run: |
-          export APP_FRANKENPHP_TAG=php8.4
-          docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.app -t code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base:latest --build-arg "FRANKENPHP_TAG=${APP_FRANKENPHP_TAG}" .
-          docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG}
-          docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base:latest
-
-  build-base-worker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v5
-
-      - name: Login to registry
-        uses: docker/login-action@v2
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        env:
+          APP_FRANKENPHP_TAG: php8.4
         with:
-          registry: "${{ vars.REGISTRY_URL }}"
-          username: "${{ vars.REGISTRY_USER }}"
-          password: "${{ vars.REGISTRY_PASS }}"
-
-      - name: Create torsearch-worker docker image
-        run: |
-          export WORKER_FRANKENPHP_TAG=php8.4-alpine
-          docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG} -t code.caldwell.digital/home/torsearch-base-worker:latest --build-arg "FRANKENPHP_TAG=${WORKER_FRANKENPHP_TAG}" .
-          docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base-worker:${WORKER_FRANKENPHP_TAG}
-          docker push --platform=linux/amd64 code.caldwell.digital/home/torsearch-base-worker:latest
+          context: .
+          push: true
+          file: docker/Dockerfile.base.worker
+          platforms: linux/amd64
+          build-args: |
+            APP_FRANKENPHP_TAG=${{ env.APP_FRANKENPHP_TAG }}
+          tags: |
+            code.caldwell.digital/home/torsearch-base:${APP_FRANKENPHP_TAG}
+            code.caldwell.digital/home/torsearch-base:latest
 
   build-base-worker-supervisord:
     runs-on: ubuntu-latest
@@ -61,14 +49,10 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          build-args: |
-            ALPINE_VERSION=3.22
           push: true
           file: docker/Dockerfile.base.worker
           platforms: linux/amd64
+          build-args: |
+            ALPINE_VERSION=3.22
           tags: |
             code.caldwell.digital/home/torsearch-base-worker-supervisord:latest
-
-#      - name: Create torsearch-scheduler docker image
-#        run: |
-#          docker buildx build --platform=linux/amd64 -f docker/Dockerfile.base.worker -t code.caldwell.digital/home/torsearch-base-worker-supervisord:latest --build-arg "ALPINE_VERSION=${ALPINE_VERSION}" .