diff --git a/.github/workflows/build-self-host-docker-images.yml b/.github/workflows/build-self-host-docker-images.yml
index e4afec42b..d77a23799 100644
--- a/.github/workflows/build-self-host-docker-images.yml
+++ b/.github/workflows/build-self-host-docker-images.yml
@@ -35,13 +35,15 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build and push backend
+      - name: Build and push image-proxy
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: ghcr.io/omnivore-app/sh-backend:latest,ghcr.io/omnivore-app/sh-backend:${{ github.sha }}
-          file: packages/api/Dockerfile
+          tags: ghcr.io/omnivore-app/sh-image-proxy:latest,ghcr.io/omnivore-app/sh-image-proxy:${{ github.sha }}
+          context: imageproxy/
+          file: imageproxy/Dockerfile
+
       - name: Build and push content-fetch
         uses: docker/build-push-action@v6
         with:
@@ -49,13 +51,7 @@ jobs:
           push: true
           tags: ghcr.io/omnivore-app/sh-content-fetch:latest,ghcr.io/omnivore-app/sh-content-fetch:${{ github.sha }}
           file: packages/content-fetch/Dockerfile
-      - name: Build and push queue-processor
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ghcr.io/omnivore-app/sh-queue-processor:latest,ghcr.io/omnivore-app/sh-queue-processor:${{ github.sha }}
-          file: packages/api/queue-processor/Dockerfile
+
       - name: Build and push migrate
         uses: docker/build-push-action@v6
         with:
@@ -63,17 +59,7 @@ jobs:
           push: true
           tags: ghcr.io/omnivore-app/sh-migrate:latest,ghcr.io/omnivore-app/sh-migrate:${{ github.sha }}
           file: packages/db/Dockerfile
-      - name: Copy files for image proxy.
-        run: |
-          cp imageproxy/start_imageproxy.sh .
-          chmod +x start_imageproxy.sh
-      - name: Build and push image-proxy
-        uses: docker/build-push-action@v6
-        with:
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ghcr.io/omnivore-app/sh-image-proxy:latest,ghcr.io/omnivore-app/sh-image-proxy:${{ github.sha }}
-          file: imageproxy/Dockerfile
+
       - name: Build and push local-mail-watcher
         uses: docker/build-push-action@v6
         with:
@@ -81,3 +67,19 @@ jobs:
           push: true
           tags: ghcr.io/omnivore-app/sh-local-mail-watcher:latest,ghcr.io/omnivore-app/sh-local-mail-watcher:${{ github.sha }}
           file: packages/local-mail-watcher/Dockerfile
+
+      - name: Build and push backend
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ghcr.io/omnivore-app/sh-backend:latest,ghcr.io/omnivore-app/sh-backend:${{ github.sha }}
+          file: packages/api/Dockerfile
+
+      - name: Build and push queue-processor
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ghcr.io/omnivore-app/sh-queue-processor:latest,ghcr.io/omnivore-app/sh-queue-processor:${{ github.sha }}
+          file: packages/api/queue-processor/Dockerfile