diff --git a/.gitea/workflows/APP_NAME-build.yaml b/.gitea/workflows/APP_NAME-build.yaml
index 0dc4bf7..41d64df 100644
--- a/.gitea/workflows/APP_NAME-build.yaml
+++ b/.gitea/workflows/APP_NAME-build.yaml
@@ -50,9 +50,11 @@ jobs:
           TENANT_ID_NODASHES: ${{ vars.TENANT_ID_NODASHES }}
           TENANT_TIER: ${{ vars.TENANT_TIER }}
           IMAGE_TAG: ${{ needs.build.outputs.image_tag }}
+        # ADR-054: en cluster tenant los namespaces son funcionales (apps/addons),
+        # sin tenant-id en el nombre — el cluster ya es el sandbox del tenant.
         run: |
           helm upgrade --install __APP_NAME__ ./helm/__APP_NAME__ \
-            --namespace tenant-${TENANT_ID_NODASHES}-apps \
+            --namespace apps \
             --create-namespace \
             --set image.tag=${IMAGE_TAG} \
             --set tenantId=${TENANT_ID} \
@@ -61,11 +63,8 @@ jobs:
             --wait --timeout 5m
 
       - name: Verificar rollout
-        env:
-          TENANT_ID_NODASHES: ${{ vars.TENANT_ID_NODASHES }}
         run: |
-          kubectl -n tenant-${TENANT_ID_NODASHES}-apps \
-            rollout status deploy/__APP_NAME__ --timeout=3m
+          kubectl -n apps rollout status deploy/__APP_NAME__ --timeout=3m
 
       - name: Smoke check post-deploy
         env:
diff --git a/helm/APP_NAME/values.yaml b/helm/APP_NAME/values.yaml
index 16dc5ef..7e6e4fe 100644
--- a/helm/APP_NAME/values.yaml
+++ b/helm/APP_NAME/values.yaml
@@ -66,4 +66,4 @@ serviceMonitor:
 
 networkPolicy:
   enabled: true
-  addonsNamespace: __TENANT_ID_NODASHES__-addons
+  addonsNamespace: addons          # ADR-054: namespace funcional fijo en cluster tenant