diff --git a/.github/workflows/publish_executor_containers.yaml b/.github/workflows/publish_executor_containers.yaml
index 0daee75e7..88dddbe07 100644
--- a/.github/workflows/publish_executor_containers.yaml
+++ b/.github/workflows/publish_executor_containers.yaml
@@ -1,6 +1,14 @@
-name: Publish Example Executor Containers
+name: Publish Executor Containers
 
 on:
+  workflow_call:
+    inputs:
+      indexify_version:
+        type: string
+        description: |
+          Indexify version to use to build the executor containers.
+          Note: Should ideally match the tag used for this workflow.
+        required: true
   workflow_dispatch:
     inputs:
       indexify_version:
diff --git a/.github/workflows/publish_indexify_pypi.yaml b/.github/workflows/publish_indexify_pypi.yaml
index d762f54cd..ff8c063bb 100644
--- a/.github/workflows/publish_indexify_pypi.yaml
+++ b/.github/workflows/publish_indexify_pypi.yaml
@@ -79,26 +79,11 @@ jobs:
         with:
           packages-dir: python-sdk/dist/
 
-  build-and-push-docker-images:
-    name: Build and Push Docker Executor 
-    runs-on: ubuntu-latest
+  publish-containers:
+    name: Publish Containers
     needs:
       - extract-version
       - publish-indexify-to-pypi
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - run: |
-          # wait for the indexify-cli to be available
-          sleep 60
-      - uses: ./.github/workflows/publish_executor_containers.yaml
-        with:
-          indexify_version: ${{ needs.extract-version.outputs.version }}
+    uses: ./.github/workflows/publish_executor_containers.yaml
+    with:
+      indexify_version: ${{ needs.extract-version.outputs.version }}