diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 7903a2db..93b2592d 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -1,5 +1,9 @@
 name: Merge
 
+concurrency:
+  group: main
+  cancel-in-progress: false
+# This concurrency group ensures that only one workflow runs at a time for the main branch.
 on:
   push:
     branches: [main]
@@ -47,12 +51,15 @@ jobs:
     name: Retag Images Dev
     needs: [deploy_stack_dev, vars]
     runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        package: [backend, migrations, frontend]
     steps:
       - name: retag
         uses: shrink/actions-docker-registry-tag@f04afd0559f66b288586792eb150f45136a927fa # v4
         with:
           registry: ghcr.io
-          repository: ${{ github.repository }}
+          repository: ${{ github.repository }}/${{ matrix.package }}
           target:  ${{ needs.vars.outputs.pr }}
           tags: |
             dev
@@ -77,12 +84,15 @@ jobs:
     name: Retag Images Test
     needs: [deploy_stack_test, vars]
     runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        package: [backend, migrations, frontend]
     steps:
       - name: retag
         uses: shrink/actions-docker-registry-tag@f04afd0559f66b288586792eb150f45136a927fa # v4
         with:
           registry: ghcr.io
-          repository: ${{ github.repository }}
+          repository: ${{ github.repository }}/${{ matrix.package }}
           target:  ${{ needs.vars.outputs.pr }}
           tags: |
             test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 522008be..8aa6b124 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,7 +1,10 @@
 name: PROD
 on:
   workflow_dispatch:
-
+concurrency:
+  group: main
+  cancel-in-progress: false
+# This concurrency group ensures that only one workflow runs at a time for the main branch.
 permissions:
     id-token: write # This is required for requesting the JWT
     contents: write # This is required for actions/checkout
@@ -30,12 +33,15 @@ jobs:
     name: Retag Images
     needs: [vars]
     runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        package: [backend, migrations, frontend]
     steps:
       - name: retag
         uses: shrink/actions-docker-registry-tag@f04afd0559f66b288586792eb150f45136a927fa # v4
         with:
           registry: ghcr.io
-          repository: ${{ github.repository }}
+          repository: ${{ github.repository }}/${{ matrix.package }}
           target:  test # this is the tag of the containers to deploy
           tags: |
             prod