diff --git a/.woodpecker.yml b/.woodpecker.yml
index f90365b..5946fbc 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,14 +1,53 @@
 steps:
-- name: echo-secret
-  image: alpine:latest
+# ── 1. Build & push images ──────────────────────────────
+- name: build-and-push
+  image: docker:24.0-cli
+  privileged: true
+  volumes:
+    - name: docker-sock
+      path: /var/run/docker.sock
   environment:
-    STAGING_SSH_KEY: test123
+    REG: us-central1-docker.pkg.dev/aptivaai-dev/aptiva-repo
   commands:
     - |
-      echo "START SECRET"
-      echo "$STAGING_SSH_KEY" | wc -c
-      echo "$STAGING_SSH_KEY" | head -c 64
-      echo "END SECRET"
+      set -eu
+      TAG=$(echo "$CI_COMMIT_SHA" | head -c 8)
+      docker buildx create --use --name woodpecker || true
+      for svc in server1 server2 server3 nginx; do
+        docker buildx build -f Dockerfile.${svc} \
+          -t ${REG}/${svc}:${TAG} --push .
+      done
   when:
     event: [push, manual]
     branch: [master]
+
+# ── 2. Deploy to staging ────────────────────────────────
+- name: deploy-staging
+  image: alpine:latest
+  environment:
+    STAGING_SSH_KEY_B64: <base64-encoded-key>
+    STAGING_KNOWN_HOSTS_B64: <base64-encoded-known-hosts>
+  commands:
+    - |
+      set -eu
+      apk add --no-cache openssh bash
+
+      mkdir -p ~/.ssh
+      echo "$STAGING_KNOWN_HOSTS_B64" | base64 -d > ~/.ssh/known_hosts
+      echo "$STAGING_SSH_KEY_B64" | base64 -d > ~/.ssh/id_ed25519
+      chmod 600 ~/.ssh/id_ed25519
+
+      TAG=$(echo "$CI_COMMIT_SHA" | head -c 8)
+      ssh -i ~/.ssh/id_ed25519 -o StrictHostKeyChecking=yes jcoakley@10.128.0.12 <<EOF
+        cd /opt/aptiva-staging-app
+        IMG_TAG=$TAG docker compose pull
+        IMG_TAG=$TAG docker compose up -d --force-recreate --remove-orphans
+      EOF
+  when:
+    event: [push, manual]
+    branch: [master]
+
+volumes:
+  - name: docker-sock
+    host:
+      path: /var/run/docker.sock