diff --git a/.ci/build.sh b/.ci/build.sh
index 19a418c4fa..5400bda0c9 100755
--- a/.ci/build.sh
+++ b/.ci/build.sh
@@ -5,13 +5,15 @@ set -e
 trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
 trap 'echo "$0: \"${last_command}\" command failed with exit code $?"' ERR
 
-YAML_FILE=$1
+LIST=$1
 VARIANT=$2
 PACKAGE_NAME=$3
 WORKSPACE=/tmp/workspace
 ARTIFACTS_FOLDER=/tmp/artifacts
 IDX_FILE=$ARTIFACTS_FOLDER/idx.txt
 
+YAML_FILE=$LIST.yaml
+
 sudo apt-get -y install dpkg-dev
 
 ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
@@ -81,7 +83,7 @@ echo "$0: catking reported following topological build order:"
 echo "$BUILD_ORDER"
 echo ""
 
-ROSDEP_FILE="$ARTIFACTS_FOLDER/generated_$ARCH.yaml"
+ROSDEP_FILE="$ARTIFACTS_FOLDER/generated_$LIST_$ARCH.yaml"
 
 cat $ROSDEP_FILE
 
diff --git a/.ci/get_build_matrix.sh b/.ci/get_build_matrix.sh
index 11cce71646..def11fad01 100755
--- a/.ci/get_build_matrix.sh
+++ b/.ci/get_build_matrix.sh
@@ -7,12 +7,14 @@ trap 'echo "$0: \"${last_command}\" command failed with exit code $?, log:" && c
 
 DEBUG=false
 
-YAML_FILE=$1
+LIST=$1
 VARIANT=$2
 ARCH=$3
 WORKSPACE=/tmp/workspace
 ARTIFACTS_FOLDER=/tmp/artifacts
 
+YAML_FILE=$LIST.yaml
+
 ./.ci_scripts/package_build/add_ros_ppa.sh >> /tmp/log.txt 2>&1
 
 # curl https://ctu-mrs.github.io/ppa-$VARIANT/add_ppa.sh 2>> /tmp/log.txt | bash >> /tmp/log.txt 2>&1
diff --git a/.github/workflows/stable_mrs_amd64.yml b/.github/workflows/stable_mrs_amd64.yml
index 8a34e22ff5..9e90f5a95a 100644
--- a/.github/workflows/stable_mrs_amd64.yml
+++ b/.github/workflows/stable_mrs_amd64.yml
@@ -18,7 +18,7 @@ jobs:
         run: |
           mkdir -p /tmp/artifacts
           mkdir -p /tmp/artifacts/metarepositories
-          touch /tmp/artifacts/generated_amd64.yaml
+          touch /tmp/artifacts/generated_mrs_amd64.yaml
           touch /tmp/artifacts/compiled.txt
           echo "0" >> /tmp/artifacts/idx.txt
       - name: Save artifacts
@@ -46,7 +46,7 @@ jobs:
           token: ${{ secrets.PUSH_TOKEN }}
       - id: generate
         run: |
-          JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh mrs.yaml stable amd64)
+          JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh mrs stable amd64)
           cat /tmp/log.txt
           echo "packages=$JOB_STRATEGY_MATRIX" >> "$GITHUB_OUTPUT"
 
@@ -77,7 +77,7 @@ jobs:
           token: ${{ secrets.PUSH_TOKEN }}
       - id: build
         run: |
-          .ci/build.sh mrs.yaml stable "${{ matrix.job }}"
+          .ci/build.sh mrs stable "${{ matrix.job }}"
       - name: Save artifacts
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/stable_mrs_arm64.yml b/.github/workflows/stable_mrs_arm64.yml
index 2467e1d04f..7932528c73 100644
--- a/.github/workflows/stable_mrs_arm64.yml
+++ b/.github/workflows/stable_mrs_arm64.yml
@@ -18,7 +18,7 @@ jobs:
         run: |
           mkdir -p /tmp/artifacts
           mkdir -p /tmp/artifacts/metarepositories
-          touch /tmp/artifacts/generated_arm64.yaml
+          touch /tmp/artifacts/generated_mrs_arm64.yaml
           touch /tmp/artifacts/compiled.txt
           echo "0" >> /tmp/artifacts/idx.txt
       - name: Save artifacts
@@ -46,7 +46,7 @@ jobs:
           token: ${{ secrets.PUSH_TOKEN }}
       - id: generate
         run: |
-          JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh mrs.yaml stable arm64)
+          JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh mrs stable arm64)
           cat /tmp/log.txt
           echo "packages=$JOB_STRATEGY_MATRIX" >> "$GITHUB_OUTPUT"
 
@@ -101,7 +101,7 @@ jobs:
 
           # Produce a binary artifact and place it in the mounted volume
           run: |
-            /tmp/repository/.ci/build.sh mrs.yaml stable "${{ matrix.job }}"
+            /tmp/repository/.ci/build.sh mrs stable "${{ matrix.job }}"
 
       - name: Save artifacts
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/unstable_mrs_amd64.yml b/.github/workflows/unstable_mrs_amd64.yml
index e0b23ef9f8..018e1df506 100644
--- a/.github/workflows/unstable_mrs_amd64.yml
+++ b/.github/workflows/unstable_mrs_amd64.yml
@@ -18,7 +18,7 @@ jobs:
         run: |
           mkdir -p /tmp/artifacts
           mkdir -p /tmp/artifacts/metarepositories
-          touch /tmp/artifacts/generated_amd64.yaml
+          touch /tmp/artifacts/generated_mrs_amd64.yaml
           touch /tmp/artifacts/compiled.txt
           echo "0" >> /tmp/artifacts/idx.txt
       - name: Save artifacts
@@ -46,7 +46,7 @@ jobs:
           token: ${{ secrets.PUSH_TOKEN }}
       - id: generate
         run: |
-          JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh mrs.yaml unstable amd64)
+          JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh mrs unstable amd64)
           cat /tmp/log.txt
           echo "packages=$JOB_STRATEGY_MATRIX" >> "$GITHUB_OUTPUT"
 
@@ -77,7 +77,7 @@ jobs:
           token: ${{ secrets.PUSH_TOKEN }}
       - id: build
         run: |
-          .ci/build.sh mrs.yaml unstable "${{ matrix.job }}"
+          .ci/build.sh mrs unstable "${{ matrix.job }}"
       - name: Save artifacts
         uses: actions/upload-artifact@v3
         with:
diff --git a/.github/workflows/unstable_mrs_arm64.yml b/.github/workflows/unstable_mrs_arm64.yml
index 12c1af3876..756d29b216 100644
--- a/.github/workflows/unstable_mrs_arm64.yml
+++ b/.github/workflows/unstable_mrs_arm64.yml
@@ -18,7 +18,7 @@ jobs:
         run: |
           mkdir -p /tmp/artifacts
           mkdir -p /tmp/artifacts/metarepositories
-          touch /tmp/artifacts/generated_arm64.yaml
+          touch /tmp/artifacts/generated_mrs_arm64.yaml
           touch /tmp/artifacts/compiled.txt
           echo "0" >> /tmp/artifacts/idx.txt
       - name: Save artifacts
@@ -46,7 +46,7 @@ jobs:
           token: ${{ secrets.PUSH_TOKEN }}
       - id: generate
         run: |
-          JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh mrs.yaml unstable arm64)
+          JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh mrs unstable arm64)
           cat /tmp/log.txt
           echo "packages=$JOB_STRATEGY_MATRIX" >> "$GITHUB_OUTPUT"
 
@@ -101,7 +101,7 @@ jobs:
 
           # Produce a binary artifact and place it in the mounted volume
           run: |
-            /tmp/repository/.ci/build.sh mrs.yaml unstable "${{ matrix.job }}"
+            /tmp/repository/.ci/build.sh mrs unstable "${{ matrix.job }}"
 
       - name: Save artifacts
         uses: actions/upload-artifact@v3
diff --git a/.github/workflows/unstable_thirdparty_amd64.yml b/.github/workflows/unstable_thirdparty_amd64.yml
index 8aa135ab83..2e53ed1abf 100644
--- a/.github/workflows/unstable_thirdparty_amd64.yml
+++ b/.github/workflows/unstable_thirdparty_amd64.yml
@@ -15,7 +15,7 @@ jobs:
         run: |
           mkdir -p /tmp/artifacts
           mkdir -p /tmp/artifacts/metarepositories
-          touch /tmp/artifacts/generated_amd64.yaml
+          touch /tmp/artifacts/generated_thirdparty_amd64.yaml
           touch /tmp/artifacts/compiled.txt
           echo "0" >> /tmp/artifacts/idx.txt
       - name: Save artifacts
@@ -43,7 +43,7 @@ jobs:
           token: ${{ secrets.PUSH_TOKEN }}
       - id: generate
         run: |
-          JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh thirdparty.yaml unstable amd64)
+          JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh thirdparty unstable amd64)
           cat /tmp/log.txt
           echo "packages=$JOB_STRATEGY_MATRIX" >> "$GITHUB_OUTPUT"
 
@@ -74,7 +74,7 @@ jobs:
           token: ${{ secrets.PUSH_TOKEN }}
       - id: build
         run: |
-          .ci/build.sh thirdparty.yaml unstable "${{ matrix.job }}"
+          .ci/build.sh thirdparty unstable "${{ matrix.job }}"
       - name: Save artifacts
         uses: actions/upload-artifact@v3
         with: