diff --git a/tenants/acme/30-apps-stubs.yaml b/tenants/acme/30-apps-stubs.yaml
index 01966a5..f2e24d6 100644
--- a/tenants/acme/30-apps-stubs.yaml
+++ b/tenants/acme/30-apps-stubs.yaml
@@ -66,6 +66,7 @@ spec:
           - { path: /api/assistencia-social, pathType: Prefix, backend: { service: { name: servico-assistencia-social, port: { number: 80 } } } }
           - { path: /api/pedagogico, pathType: Prefix, backend: { service: { name: servico-pedagogico, port: { number: 80 } } } }
           - { path: /api/nutricao, pathType: Prefix, backend: { service: { name: servico-nutricao, port: { number: 80 } } } }
+          - { path: /api/agenda, pathType: Prefix, backend: { service: { name: servico-agenda, port: { number: 80 } } } }
           - { path: /api, pathType: Prefix, backend: { service: { name: backend, port: { number: 80 } } } }
           - { path: /, pathType: Prefix, backend: { service: { name: frontend-spa, port: { number: 80 } } } }
     - host: auth-acme.athleticmap.influxdigital.com.br
diff --git a/tenants/acme/86-servico-agenda.yaml b/tenants/acme/86-servico-agenda.yaml
new file mode 100644
index 0000000..afdd619
--- /dev/null
+++ b/tenants/acme/86-servico-agenda.yaml
@@ -0,0 +1,54 @@
+# Bounded context "agenda" (agendamento de compromissos: consulta/avaliacao/retorno/treino/reuniao, ADR-0002).
+# Schema proprio "agenda"; roteado em /api/agenda no ingress.
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: servico-agenda
+  namespace: acme-prod
+  labels: { app: servico-agenda, athleticmap.io/contexto: agenda }
+spec:
+  replicas: 1
+  selector: { matchLabels: { app: servico-agenda } }
+  template:
+    metadata:
+      labels: { app: servico-agenda, athleticmap.io/contexto: agenda }
+    spec:
+      containers:
+        - name: servico-agenda
+          image: docker.io/library/servico-agenda:1.0
+          imagePullPolicy: Never
+          ports: [{ containerPort: 8083 }]
+          env:
+            - { name: SPRING_DATASOURCE_URL, value: "jdbc:postgresql://postgres:5432/athleticmap" }
+            - { name: SPRING_DATASOURCE_USERNAME, value: "atm" }
+            - { name: SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE, value: "5" }
+            - name: SPRING_DATASOURCE_PASSWORD
+              valueFrom:
+                secretKeyRef: { name: db-credentials, key: password }
+            - { name: ATM_JWK_SET_URI, value: "http://keycloak:8080/realms/athleticmap/protocol/openid-connect/certs" }
+            - { name: ATM_ISSUER, value: "https://auth-acme.athleticmap.influxdigital.com.br/realms/athleticmap" }
+            - { name: ATM_TENANT, value: "acme" }
+          resources:
+            requests: { cpu: 100m, memory: 300Mi }
+            limits: { cpu: "1", memory: 640Mi }
+          readinessProbe:
+            httpGet: { path: /api/agenda/health, port: 8083 }
+            initialDelaySeconds: 25
+            periodSeconds: 10
+            failureThreshold: 30
+          livenessProbe:
+            httpGet: { path: /actuator/health/liveness, port: 8083 }
+            initialDelaySeconds: 60
+            periodSeconds: 20
+            failureThreshold: 6
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: servico-agenda
+  namespace: acme-prod
+  labels: { app: servico-agenda }
+spec:
+  selector: { app: servico-agenda }
+  ports: [{ name: http, port: 80, targetPort: 8083 }]
diff --git a/tenants/acme/90-servico-bff.yaml b/tenants/acme/90-servico-bff.yaml
index ead1cdc..0f549f3 100644
--- a/tenants/acme/90-servico-bff.yaml
+++ b/tenants/acme/90-servico-bff.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: servico-bff
-          image: docker.io/library/servico-bff:1.32
+          image: docker.io/library/servico-bff:1.33
           imagePullPolicy: Never
           ports: [{ containerPort: 8083 }]
           env:
@@ -36,6 +36,7 @@ spec:
             - { name: ATM_ASSISTENCIA_SOCIAL_URL, value: "http://servico-assistencia-social" }
             - { name: ATM_PEDAGOGICO_URL, value: "http://servico-pedagogico" }
             - { name: ATM_NUTRICAO_URL, value: "http://servico-nutricao" }
+            - { name: ATM_AGENDA_URL, value: "http://servico-agenda" }
             - { name: ATM_JWK_SET_URI, value: "http://keycloak:8080/realms/athleticmap/protocol/openid-connect/certs" }
             - { name: ATM_ISSUER, value: "https://auth-acme.athleticmap.influxdigital.com.br/realms/athleticmap" }
             - { name: ATM_TENANT, value: "acme" }
diff --git a/tenants/acme/95-frontend-spa.yaml b/tenants/acme/95-frontend-spa.yaml
index 06a16a1..043d5fb 100644
--- a/tenants/acme/95-frontend-spa.yaml
+++ b/tenants/acme/95-frontend-spa.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: frontend-spa
-          image: docker.io/library/frontend-spa:1.55
+          image: docker.io/library/frontend-spa:1.56
           imagePullPolicy: Never
           ports: [{ containerPort: 80 }]
           env:
diff --git a/tenants/demo/30-apps-stubs.yaml b/tenants/demo/30-apps-stubs.yaml
index 69be29f..ff6544e 100644
--- a/tenants/demo/30-apps-stubs.yaml
+++ b/tenants/demo/30-apps-stubs.yaml
@@ -66,6 +66,7 @@ spec:
           - { path: /api/assistencia-social, pathType: Prefix, backend: { service: { name: servico-assistencia-social, port: { number: 80 } } } }
           - { path: /api/pedagogico, pathType: Prefix, backend: { service: { name: servico-pedagogico, port: { number: 80 } } } }
           - { path: /api/nutricao, pathType: Prefix, backend: { service: { name: servico-nutricao, port: { number: 80 } } } }
+          - { path: /api/agenda, pathType: Prefix, backend: { service: { name: servico-agenda, port: { number: 80 } } } }
           - { path: /api, pathType: Prefix, backend: { service: { name: backend, port: { number: 80 } } } }
           - { path: /, pathType: Prefix, backend: { service: { name: frontend-spa, port: { number: 80 } } } }
     - host: auth-demo.athleticmap.influxdigital.com.br
diff --git a/tenants/demo/86-servico-agenda.yaml b/tenants/demo/86-servico-agenda.yaml
new file mode 100644
index 0000000..20a07b4
--- /dev/null
+++ b/tenants/demo/86-servico-agenda.yaml
@@ -0,0 +1,54 @@
+# Bounded context "agenda" (agendamento de compromissos: consulta/avaliacao/retorno/treino/reuniao, ADR-0002).
+# Schema proprio "agenda"; roteado em /api/agenda no ingress.
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: servico-agenda
+  namespace: demo-prod
+  labels: { app: servico-agenda, athleticmap.io/contexto: agenda }
+spec:
+  replicas: 1
+  selector: { matchLabels: { app: servico-agenda } }
+  template:
+    metadata:
+      labels: { app: servico-agenda, athleticmap.io/contexto: agenda }
+    spec:
+      containers:
+        - name: servico-agenda
+          image: docker.io/library/servico-agenda:1.0
+          imagePullPolicy: Never
+          ports: [{ containerPort: 8083 }]
+          env:
+            - { name: SPRING_DATASOURCE_URL, value: "jdbc:postgresql://postgres:5432/athleticmap" }
+            - { name: SPRING_DATASOURCE_USERNAME, value: "atm" }
+            - { name: SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE, value: "5" }
+            - name: SPRING_DATASOURCE_PASSWORD
+              valueFrom:
+                secretKeyRef: { name: db-credentials, key: password }
+            - { name: ATM_JWK_SET_URI, value: "http://keycloak:8080/realms/athleticmap/protocol/openid-connect/certs" }
+            - { name: ATM_ISSUER, value: "https://auth-demo.athleticmap.influxdigital.com.br/realms/athleticmap" }
+            - { name: ATM_TENANT, value: "demo" }
+          resources:
+            requests: { cpu: 100m, memory: 300Mi }
+            limits: { cpu: "1", memory: 640Mi }
+          readinessProbe:
+            httpGet: { path: /api/agenda/health, port: 8083 }
+            initialDelaySeconds: 25
+            periodSeconds: 10
+            failureThreshold: 30
+          livenessProbe:
+            httpGet: { path: /actuator/health/liveness, port: 8083 }
+            initialDelaySeconds: 60
+            periodSeconds: 20
+            failureThreshold: 6
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: servico-agenda
+  namespace: demo-prod
+  labels: { app: servico-agenda }
+spec:
+  selector: { app: servico-agenda }
+  ports: [{ name: http, port: 80, targetPort: 8083 }]
diff --git a/tenants/demo/90-servico-bff.yaml b/tenants/demo/90-servico-bff.yaml
index 3017724..e3d7cbc 100644
--- a/tenants/demo/90-servico-bff.yaml
+++ b/tenants/demo/90-servico-bff.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: servico-bff
-          image: docker.io/library/servico-bff:1.32
+          image: docker.io/library/servico-bff:1.33
           imagePullPolicy: Never
           ports: [{ containerPort: 8083 }]
           env:
@@ -36,6 +36,7 @@ spec:
             - { name: ATM_ASSISTENCIA_SOCIAL_URL, value: "http://servico-assistencia-social" }
             - { name: ATM_PEDAGOGICO_URL, value: "http://servico-pedagogico" }
             - { name: ATM_NUTRICAO_URL, value: "http://servico-nutricao" }
+            - { name: ATM_AGENDA_URL, value: "http://servico-agenda" }
             - { name: ATM_JWK_SET_URI, value: "http://keycloak:8080/realms/athleticmap/protocol/openid-connect/certs" }
             - { name: ATM_ISSUER, value: "https://auth-demo.athleticmap.influxdigital.com.br/realms/athleticmap" }
             - { name: ATM_TENANT, value: "demo" }
diff --git a/tenants/demo/95-frontend-spa.yaml b/tenants/demo/95-frontend-spa.yaml
index f8fc5d3..f5dd3d3 100644
--- a/tenants/demo/95-frontend-spa.yaml
+++ b/tenants/demo/95-frontend-spa.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: frontend-spa
-          image: docker.io/library/frontend-spa:1.55
+          image: docker.io/library/frontend-spa:1.56
           imagePullPolicy: Never
           ports: [{ containerPort: 80 }]
           env:
diff --git a/tenants/piloto/30-apps-stubs.yaml b/tenants/piloto/30-apps-stubs.yaml
index a50f7bc..4508166 100644
--- a/tenants/piloto/30-apps-stubs.yaml
+++ b/tenants/piloto/30-apps-stubs.yaml
@@ -66,6 +66,7 @@ spec:
           - { path: /api/assistencia-social, pathType: Prefix, backend: { service: { name: servico-assistencia-social, port: { number: 80 } } } }
           - { path: /api/pedagogico, pathType: Prefix, backend: { service: { name: servico-pedagogico, port: { number: 80 } } } }
           - { path: /api/nutricao, pathType: Prefix, backend: { service: { name: servico-nutricao, port: { number: 80 } } } }
+          - { path: /api/agenda, pathType: Prefix, backend: { service: { name: servico-agenda, port: { number: 80 } } } }
           - { path: /api, pathType: Prefix, backend: { service: { name: backend, port: { number: 80 } } } }
           - { path: /, pathType: Prefix, backend: { service: { name: frontend-spa, port: { number: 80 } } } }
     - host: auth-piloto.athleticmap.influxdigital.com.br
diff --git a/tenants/piloto/86-servico-agenda.yaml b/tenants/piloto/86-servico-agenda.yaml
new file mode 100644
index 0000000..9f69d01
--- /dev/null
+++ b/tenants/piloto/86-servico-agenda.yaml
@@ -0,0 +1,54 @@
+# Bounded context "agenda" (agendamento de compromissos: consulta/avaliacao/retorno/treino/reuniao, ADR-0002).
+# Schema proprio "agenda"; roteado em /api/agenda no ingress.
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: servico-agenda
+  namespace: piloto-prod
+  labels: { app: servico-agenda, athleticmap.io/contexto: agenda }
+spec:
+  replicas: 1
+  selector: { matchLabels: { app: servico-agenda } }
+  template:
+    metadata:
+      labels: { app: servico-agenda, athleticmap.io/contexto: agenda }
+    spec:
+      containers:
+        - name: servico-agenda
+          image: docker.io/library/servico-agenda:1.0
+          imagePullPolicy: Never
+          ports: [{ containerPort: 8083 }]
+          env:
+            - { name: SPRING_DATASOURCE_URL, value: "jdbc:postgresql://postgres:5432/athleticmap" }
+            - { name: SPRING_DATASOURCE_USERNAME, value: "atm" }
+            - { name: SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE, value: "5" }
+            - name: SPRING_DATASOURCE_PASSWORD
+              valueFrom:
+                secretKeyRef: { name: db-credentials, key: password }
+            - { name: ATM_JWK_SET_URI, value: "http://keycloak:8080/realms/athleticmap/protocol/openid-connect/certs" }
+            - { name: ATM_ISSUER, value: "https://auth-piloto.athleticmap.influxdigital.com.br/realms/athleticmap" }
+            - { name: ATM_TENANT, value: "piloto" }
+          resources:
+            requests: { cpu: 100m, memory: 300Mi }
+            limits: { cpu: "1", memory: 640Mi }
+          readinessProbe:
+            httpGet: { path: /api/agenda/health, port: 8083 }
+            initialDelaySeconds: 25
+            periodSeconds: 10
+            failureThreshold: 30
+          livenessProbe:
+            httpGet: { path: /actuator/health/liveness, port: 8083 }
+            initialDelaySeconds: 60
+            periodSeconds: 20
+            failureThreshold: 6
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: servico-agenda
+  namespace: piloto-prod
+  labels: { app: servico-agenda }
+spec:
+  selector: { app: servico-agenda }
+  ports: [{ name: http, port: 80, targetPort: 8083 }]
diff --git a/tenants/piloto/90-servico-bff.yaml b/tenants/piloto/90-servico-bff.yaml
index ed9f524..5641954 100644
--- a/tenants/piloto/90-servico-bff.yaml
+++ b/tenants/piloto/90-servico-bff.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: servico-bff
-          image: docker.io/library/servico-bff:1.32
+          image: docker.io/library/servico-bff:1.33
           imagePullPolicy: Never
           ports: [{ containerPort: 8083 }]
           env:
@@ -36,6 +36,7 @@ spec:
             - { name: ATM_ASSISTENCIA_SOCIAL_URL, value: "http://servico-assistencia-social" }
             - { name: ATM_PEDAGOGICO_URL, value: "http://servico-pedagogico" }
             - { name: ATM_NUTRICAO_URL, value: "http://servico-nutricao" }
+            - { name: ATM_AGENDA_URL, value: "http://servico-agenda" }
             - { name: ATM_JWK_SET_URI, value: "http://keycloak:8080/realms/athleticmap/protocol/openid-connect/certs" }
             - { name: ATM_ISSUER, value: "https://auth-piloto.athleticmap.influxdigital.com.br/realms/athleticmap" }
             - { name: ATM_TENANT, value: "piloto" }
diff --git a/tenants/piloto/95-frontend-spa.yaml b/tenants/piloto/95-frontend-spa.yaml
index 3acff6f..74cfe72 100644
--- a/tenants/piloto/95-frontend-spa.yaml
+++ b/tenants/piloto/95-frontend-spa.yaml
@@ -20,7 +20,7 @@ spec:
     spec:
       containers:
         - name: frontend-spa
-          image: docker.io/library/frontend-spa:1.55
+          image: docker.io/library/frontend-spa:1.56
           imagePullPolicy: Never
           ports: [{ containerPort: 80 }]
           env: