diff --git a/infra/compose/compose.build.yaml b/infra/compose/compose.build.yaml
new file mode 100644
index 0000000..93bb223
--- /dev/null
+++ b/infra/compose/compose.build.yaml
@@ -0,0 +1,88 @@
+# FILE: infra/compose/compose.build.yaml
+# Docker Compose file for building images
+# Usage: docker compose -f infra/compose/compose.build.yaml build
+
+services:
+  apa-svc-ingestion:
+    build:
+      context: ../../
+      dockerfile: apps/svc_ingestion/Dockerfile
+    image: gitea.harkon.co.uk/harkon/svc-ingestion:latest
+
+  apa-svc-extract:
+    build:
+      context: ../../
+      dockerfile: apps/svc_extract/Dockerfile
+    image: gitea.harkon.co.uk/harkon/svc-extract:latest
+
+  apa-svc-kg:
+    build:
+      context: ../../
+      dockerfile: apps/svc_kg/Dockerfile
+    image: gitea.harkon.co.uk/harkon/svc-kg:latest
+
+  apa-svc-rag-retriever:
+    build:
+      context: ../../
+      dockerfile: apps/svc_rag_retriever/Dockerfile
+    image: gitea.harkon.co.uk/harkon/svc-rag-retriever:latest
+
+  apa-svc-forms:
+    build:
+      context: ../../
+      dockerfile: apps/svc_forms/Dockerfile
+    image: gitea.harkon.co.uk/harkon/svc-forms:latest
+
+  apa-svc-hmrc:
+    build:
+      context: ../../
+      dockerfile: apps/svc_hmrc/Dockerfile
+    image: gitea.harkon.co.uk/harkon/svc-hmrc:latest
+
+  apa-svc-ocr:
+    build:
+      context: ../../
+      dockerfile: apps/svc_ocr/Dockerfile
+    image: gitea.harkon.co.uk/harkon/svc-ocr:latest
+
+  apa-svc-rag-indexer:
+    build:
+      context: ../../
+      dockerfile: apps/svc_rag_indexer/Dockerfile
+    image: gitea.harkon.co.uk/harkon/svc-rag-indexer:latest
+
+  apa-svc-reason:
+    build:
+      context: ../../
+      dockerfile: apps/svc_reason/Dockerfile
+    image: gitea.harkon.co.uk/harkon/svc-reason:latest
+
+  apa-svc-rpa:
+    build:
+      context: ../../
+      dockerfile: apps/svc_rpa/Dockerfile
+    image: gitea.harkon.co.uk/harkon/svc-rpa:latest
+
+  apa-svc-normalize-map:
+    build:
+      context: ../../
+      dockerfile: apps/svc_normalize_map/Dockerfile
+    image: gitea.harkon.co.uk/harkon/svc-normalize-map:latest
+
+  apa-svc-coverage:
+    build:
+      context: ../../
+      dockerfile: apps/svc_coverage/Dockerfile
+    image: gitea.harkon.co.uk/harkon/svc-coverage:latest
+
+  apa-svc-firm-connectors:
+    build:
+      context: ../../
+      dockerfile: apps/svc_firm_connectors/Dockerfile
+    image: gitea.harkon.co.uk/harkon/svc-firm-connectors:latest
+
+  # apa-ui-review:
+  #   build:
+  #     context: ../../ui_review
+  #     dockerfile: Dockerfile
+  #   image: gitea.harkon.co.uk/harkon/ui-review:latest
diff --git a/infra/scripts/build-and-push.sh b/infra/scripts/build-and-push.sh
new file mode 100755
index 0000000..436a978
--- /dev/null
+++ b/infra/scripts/build-and-push.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Build and Push Script for AI Tax Agent
+# Builds all service images and pushes them to the registry
+
+set -e
+
+# Colors
+GREEN='\033[0;32m'
+BLUE='\033[0;34m'
+NC='\033[0m'
+
+log_info() {
+    echo -e "${BLUE}ℹ️  $1${NC}"
+}
+
+log_success() {
+    echo -e "${GREEN}✅ $1${NC}"
+}
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")"
+COMPOSE_FILE="$PROJECT_ROOT/infra/compose/compose.build.yaml"
+
+log_info "Building and pushing images for AI Tax Agent..."
+log_info "Using compose file: $COMPOSE_FILE"
+
+# Build images
+log_info "Building images..."
+docker compose -f "$COMPOSE_FILE" build
+
+# Push images
+log_info "Pushing images to registry..."
+docker compose -f "$COMPOSE_FILE" push
+
+log_success "All images built and pushed successfully!"
diff --git a/scripts/build-and-push-images.sh b/scripts/build-and-push-images.sh
index 4c99ed0..087a7cc 100755
--- a/scripts/build-and-push-images.sh
+++ b/scripts/build-and-push-images.sh
@@ -49,7 +49,7 @@ SERVICES=(
     "svc-reason"
     "svc-firm-connectors"
     "svc-coverage"
-    "ui-review"
+    # "ui-review"
 )
 
 # Check if Docker is running