diff --git a/pmoves/Makefile b/pmoves/Makefile
index a50f6ddfa1..4f1dbbdfae 100644
--- a/pmoves/Makefile
+++ b/pmoves/Makefile
@@ -96,8 +96,15 @@ else
 DATA_SERVICES += postgres postgrest
 endif
 endif
+
+POSTGRES_SCALE_FLAGS :=
+ifeq ($(EXTERNAL_SUPABASE),true)
+  ifneq ($(SUPA_PROVIDER),compose)
+    POSTGRES_SCALE_FLAGS := --scale postgres=0 --scale postgrest=0
+  endif
+endif
 up:
-	@docker compose -p $(PROJECT) --profile data --profile workers --profile agents up -d --scale postgres=0 --scale postgrest=0
+	@docker compose -p $(PROJECT) --profile data --profile workers --profile agents up -d $(strip $(POSTGRES_SCALE_FLAGS))
 
 
 down:
diff --git a/pmoves/docker-compose.yml b/pmoves/docker-compose.yml
index 0e21ae4cbe..d121efee4f 100644
--- a/pmoves/docker-compose.yml
+++ b/pmoves/docker-compose.yml
@@ -430,7 +430,9 @@ services:
     networks: [pmoves]
 
   publisher-discord:
-    build: ./services/publisher-discord
+    build:
+      context: .
+      dockerfile: ./services/publisher-discord/Dockerfile
     restart: unless-stopped
     env_file: [.env, .env.local]
     environment:
diff --git a/pmoves/services/agent-zero/Dockerfile b/pmoves/services/agent-zero/Dockerfile
index 67a8379f7f..182ec72d35 100644
--- a/pmoves/services/agent-zero/Dockerfile
+++ b/pmoves/services/agent-zero/Dockerfile
@@ -20,12 +20,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         tesseract-ocr \
     && rm -rf /var/lib/apt/lists/*
 
-COPY requirements.txt ./
+COPY services/agent-zero/requirements.txt ./requirements.txt
 RUN pip install --no-cache-dir --upgrade pip && \
     pip install --no-cache-dir -r requirements.txt
 
 # Copy vendored Agent Zero runtime assets
-COPY runtime ${AGENT_ZERO_HOME}/runtime
+COPY services/agent-zero/runtime ${AGENT_ZERO_HOME}/runtime
 
 # Copy service implementation
 COPY services /app/services
diff --git a/pmoves/services/archon/Dockerfile b/pmoves/services/archon/Dockerfile
index e3c24cd566..24ebae3386 100644
--- a/pmoves/services/archon/Dockerfile
+++ b/pmoves/services/archon/Dockerfile
@@ -54,7 +54,7 @@ ENV SUPABASE_URL=${SUPABASE_URL_DEFAULT} \
     AGENT_FORMS_DIR=/app/configs/agents/forms \
     ARCHON_UI_STATIC_DIR=/app/static/archon-ui
 
-COPY requirements.txt ./
+COPY services/archon/requirements.txt ./requirements.txt
 RUN pip install --upgrade pip \
     && pip install -r requirements.txt
 
diff --git a/pmoves/services/publisher-discord/Dockerfile b/pmoves/services/publisher-discord/Dockerfile
index 5cf1ce8a88..463e77e5e7 100644
--- a/pmoves/services/publisher-discord/Dockerfile
+++ b/pmoves/services/publisher-discord/Dockerfile
@@ -2,7 +2,7 @@ FROM python:3.11-slim
 WORKDIR /app
 ENV PYTHONDONTWRITEBYTECODE=1 PYTHONUNBUFFERED=1
 RUN pip install --no-cache-dir --upgrade pip
-COPY requirements.txt ./
+COPY services/publisher-discord/requirements.txt ./requirements.txt
 RUN pip install --no-cache-dir -r requirements.txt
 COPY services /app/services
 EXPOSE 8092