diff --git a/.github/workflows/build-and-upload-all-services.yaml b/.github/workflows/build-and-upload-all-services.yaml
new file mode 100644
index 0000000..418cb4c
--- /dev/null
+++ b/.github/workflows/build-and-upload-all-services.yaml
@@ -0,0 +1,19 @@
+name: Build and upload docker images for all services
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-and-upload-skandha:
+    uses: ./.github/workflows/reusable/build-and-upload-bundler-service.yml
+    secrets: inherit
+    with:
+      bundler-name: skandha
+  build-and-upload-transeptor-bundler:
+    uses: ./.github/workflows/reusable/build-and-upload-bundler-service.yml
+    secrets: inherit
+    with:
+      bundler-name: transeptor-bundler
diff --git a/.github/workflows/build-and-upload-docker-images.yaml b/.github/workflows/reusable/build-and-upload-bundler-service.yaml
similarity index 52%
rename from .github/workflows/build-and-upload-docker-images.yaml
rename to .github/workflows/reusable/build-and-upload-bundler-service.yaml
index 3f9b699..76d2bc2 100644
--- a/.github/workflows/build-and-upload-docker-images.yaml
+++ b/.github/workflows/reusable/build-and-upload-bundler-service.yaml
@@ -1,13 +1,14 @@
-name: Build and upload docker images
+name: Build and upload docker images for a bundler service
 
 on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
+  workflow_call:
+    inputs:
+      bundler-name:
+        required: true
+        type: string
 
 jobs:
-  backend:
+  build-and-upload:
     name: Build and publish images
     runs-on: ubuntu-latest
     environment: dockerhub
@@ -29,24 +30,13 @@ jobs:
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       
-      - name: Build and push skandha image
+      - name: Build and push
         uses: docker/build-push-action@v4
         with:
-          context: ./bundlers/skandha
-          file: ./bundlers/skandha/Dockerfile
+          context: ./bundlers/${{ inputs.bundler-name }}
+          file: ./bundlers/${{ inputs.bundler-name }}/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ${{ secrets.DOCKER_HUB_ACCESS_TOKEN_USERNAME }}/aa-playground:skandha-${{ github.sha }}
-            ${{ secrets.DOCKER_HUB_ACCESS_TOKEN_USERNAME }}/aa-playground:skandha-latest
-
-      - name: Build and push transeptor-bundler image
-        uses: docker/build-push-action@v4
-        with:
-          context: ./bundlers/transeptor-bundler
-          file: ./bundlers/transeptor-bundler/Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_HUB_ACCESS_TOKEN_USERNAME }}/aa-playground:transeptor-bundler-${{ github.sha }}
-            ${{ secrets.DOCKER_HUB_ACCESS_TOKEN_USERNAME }}/aa-playground:transeptor-bundler-latest
+            ${{ secrets.DOCKER_HUB_ACCESS_TOKEN_USERNAME }}/aa-playground:${{ inputs.bundler-name }}-${{ github.sha }}
+            ${{ secrets.DOCKER_HUB_ACCESS_TOKEN_USERNAME }}/aa-playground:${{ inputs.bundler-name }}-latest