diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ebbbc83..dbbfcdc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -51,6 +51,10 @@ on:
         description: 'Prefix for app names in monorepo (e.g., "midaz" results in "midaz-agent")'
         type: string
         default: ''
+      app_name_overrides:
+        description: 'Explicit app name mappings in "path:name" format. Use "path:" for prefix-only. Overrides default extraction for matched paths.'
+        type: string
+        default: ''
       build_context:
         description: 'Docker build context (defaults to repository root for monorepo)'
         type: string
@@ -111,6 +115,7 @@ jobs:
           path_level: ${{ inputs.path_level }}
           get_app_name: 'true'
           app_name_prefix: ${{ inputs.app_name_prefix }}
+          app_name_overrides: ${{ inputs.app_name_overrides }}
 
       - name: Set matrix
         id: set-matrix
diff --git a/.github/workflows/gitops-update.yml b/.github/workflows/gitops-update.yml
index 243af00..06aa590 100644
--- a/.github/workflows/gitops-update.yml
+++ b/.github/workflows/gitops-update.yml
@@ -287,12 +287,28 @@ jobs:
           cd gitops
           git pull origin main
 
-      - name: Download GitOps tag artifact
+      - name: Download GitOps tag artifacts (pattern-based)
+        id: download-pattern
+        uses: actions/download-artifact@v7
+        with:
+          pattern: ${{ steps.setup.outputs.artifact_pattern }}
+          path: .gitops-tags
+          merge-multiple: true
+        continue-on-error: true
+
+      - name: Fallback to legacy artifact name
+        if: steps.download-pattern.outcome == 'failure'
         uses: actions/download-artifact@v7
         with:
           name: gitops-tags
           path: .gitops-tags
 
+      - name: List downloaded artifacts
+        shell: bash
+        run: |
+          echo "Downloaded artifacts:"
+          ls -la .gitops-tags/ || echo "No artifacts found"
+
       - name: Apply tags to values.yaml
         shell: bash
         run: |