diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index f7998bfa..70ecd021 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -42,13 +42,23 @@ jobs:
 
   deploy-container-image:
 
-    name: Release container image
+    name: Release container images
     runs-on: ubuntu-24.04
     permissions:
       contents: write
       id-token: write
     environment:
       name: release
+    strategy:
+      matrix:
+        container:
+          - trustgraph-base
+          - trustgraph-flow
+          - trustgraph-bedrock
+          - trustgraph-vertexai
+          - trustgraph-hf
+          - trustgraph-ocr
+          - trustgraph-mcp
 
     steps:
 
@@ -68,9 +78,9 @@ jobs:
       - name: Put version into package manifests
         run: make update-package-versions VERSION=${{ steps.version.outputs.VERSION }}
 
-      - name: Build containers
-        run: make container VERSION=${{ steps.version.outputs.VERSION }}
+      - name: Build container - ${{ matrix.container }}
+        run: make container-${{ matrix.container }} VERSION=${{ steps.version.outputs.VERSION }}
 
-      - name: Push containers
-        run: make push VERSION=${{ steps.version.outputs.VERSION }}
+      - name: Push container - ${{ matrix.container }}
+        run: make push-${{ matrix.container }} VERSION=${{ steps.version.outputs.VERSION }}
 
diff --git a/Makefile b/Makefile
index 99b9f5b1..cb7b1526 100644
--- a/Makefile
+++ b/Makefile
@@ -96,6 +96,50 @@ push:
 	${DOCKER} push ${CONTAINER_BASE}/trustgraph-ocr:${VERSION}
 	${DOCKER} push ${CONTAINER_BASE}/trustgraph-mcp:${VERSION}
 
+# Individual container build targets
+container-trustgraph-base: update-package-versions
+	${DOCKER} build -f containers/Containerfile.base -t ${CONTAINER_BASE}/trustgraph-base:${VERSION} .
+
+container-trustgraph-flow: update-package-versions
+	${DOCKER} build -f containers/Containerfile.flow -t ${CONTAINER_BASE}/trustgraph-flow:${VERSION} .
+
+container-trustgraph-bedrock: update-package-versions
+	${DOCKER} build -f containers/Containerfile.bedrock -t ${CONTAINER_BASE}/trustgraph-bedrock:${VERSION} .
+
+container-trustgraph-vertexai: update-package-versions
+	${DOCKER} build -f containers/Containerfile.vertexai -t ${CONTAINER_BASE}/trustgraph-vertexai:${VERSION} .
+
+container-trustgraph-hf: update-package-versions
+	${DOCKER} build -f containers/Containerfile.hf -t ${CONTAINER_BASE}/trustgraph-hf:${VERSION} .
+
+container-trustgraph-ocr: update-package-versions
+	${DOCKER} build -f containers/Containerfile.ocr -t ${CONTAINER_BASE}/trustgraph-ocr:${VERSION} .
+
+container-trustgraph-mcp: update-package-versions
+	${DOCKER} build -f containers/Containerfile.mcp -t ${CONTAINER_BASE}/trustgraph-mcp:${VERSION} .
+
+# Individual container push targets
+push-trustgraph-base:
+	${DOCKER} push ${CONTAINER_BASE}/trustgraph-base:${VERSION}
+
+push-trustgraph-flow:
+	${DOCKER} push ${CONTAINER_BASE}/trustgraph-flow:${VERSION}
+
+push-trustgraph-bedrock:
+	${DOCKER} push ${CONTAINER_BASE}/trustgraph-bedrock:${VERSION}
+
+push-trustgraph-vertexai:
+	${DOCKER} push ${CONTAINER_BASE}/trustgraph-vertexai:${VERSION}
+
+push-trustgraph-hf:
+	${DOCKER} push ${CONTAINER_BASE}/trustgraph-hf:${VERSION}
+
+push-trustgraph-ocr:
+	${DOCKER} push ${CONTAINER_BASE}/trustgraph-ocr:${VERSION}
+
+push-trustgraph-mcp:
+	${DOCKER} push ${CONTAINER_BASE}/trustgraph-mcp:${VERSION}
+
 clean:
 	rm -rf wheels/