diff --git a/.github/scripts/cmd/cmd.py b/.github/scripts/cmd/cmd.py
index 5ebf6dfd09..3d6a628e02 100755
--- a/.github/scripts/cmd/cmd.py
+++ b/.github/scripts/cmd/cmd.py
@@ -135,8 +135,8 @@
         for pallet in runtime_pallets_map[runtime]:
             config = runtimesMatrix[runtime]
             print(f'-- config: {config}')
-            default_path = f"./{config['path']}/src/weights/{pallet.replace('::', '_')}.rs"
-            xcm_path = f"./{config['path']}/src/weights/xcm/{pallet.replace('::', '_')}.rs"
+            default_path = f"./{config['path']}/src/weights"
+            xcm_path = f"./{config['path']}/src/weights/xcm"
             output_path = default_path if not pallet.startswith("pallet_xcm_benchmarks") else xcm_path
             print(f'-- benchmarking {pallet} in {runtime} into {output_path}')
 
diff --git a/.github/workflows/cmd.yml b/.github/workflows/cmd.yml
index f93206dc79..623d96a21c 100644
--- a/.github/workflows/cmd.yml
+++ b/.github/workflows/cmd.yml
@@ -166,6 +166,7 @@ jobs:
         if:  ${{ !contains(github.event.comment.body, '--quiet') }}
         id: build-link
         run: |
+          # Get exactly the CMD job link, filtering out the other jobs
           jobLink=$(curl -s \
             -H "Authorization: token ${{ steps.commands_token.outputs.token }}" \
             -H "Accept: application/vnd.github.v3+json" \